From e8f4445cc3bb607e95d81a4131362efe87ebb883 Mon Sep 17 00:00:00 2001 From: Simon Willnauer Date: Thu, 7 Nov 2013 14:39:33 +0100 Subject: [PATCH] Move MockDirectories into o.e.test.store --- .../search/basic/SearchWithRandomExceptionsTests.java | 2 +- src/test/java/org/elasticsearch/test/ElasticsearchTestCase.java | 2 +- src/test/java/org/elasticsearch/test/TestCluster.java | 2 +- .../test/store/{mock => }/MockDirectoryHelper.java | 2 +- .../test/store/{mock => }/MockFSDirectoryService.java | 2 +- .../elasticsearch/test/store/{mock => }/MockFSIndexStore.java | 2 +- .../test/store/{mock => }/MockFSIndexStoreModule.java | 2 +- .../test/store/{mock => }/MockRamDirecorySerivce.java | 2 +- .../elasticsearch/test/store/{mock => }/MockRamIndexStore.java | 2 +- .../test/store/{mock => }/MockRamIndexStoreModule.java | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) rename src/test/java/org/elasticsearch/test/store/{mock => }/MockDirectoryHelper.java (99%) rename src/test/java/org/elasticsearch/test/store/{mock => }/MockFSDirectoryService.java (98%) rename src/test/java/org/elasticsearch/test/store/{mock => }/MockFSIndexStore.java (97%) rename src/test/java/org/elasticsearch/test/store/{mock => }/MockFSIndexStoreModule.java (96%) rename src/test/java/org/elasticsearch/test/store/{mock => }/MockRamDirecorySerivce.java (98%) rename src/test/java/org/elasticsearch/test/store/{mock => }/MockRamIndexStore.java (97%) rename src/test/java/org/elasticsearch/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 a3cca1d4df2..9264ba1ed3a 100644 --- a/src/test/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsTests.java +++ b/src/test/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsTests.java @@ -32,7 +32,7 @@ import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.test.AbstractIntegrationTest; -import org.elasticsearch.test.store.mock.MockDirectoryHelper; +import org.elasticsearch.test.store.MockDirectoryHelper; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/ElasticsearchTestCase.java b/src/test/java/org/elasticsearch/test/ElasticsearchTestCase.java index 02816928de9..0663dd14690 100644 --- a/src/test/java/org/elasticsearch/test/ElasticsearchTestCase.java +++ b/src/test/java/org/elasticsearch/test/ElasticsearchTestCase.java @@ -31,7 +31,7 @@ import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.junit.listeners.LoggingListener; import org.elasticsearch.test.engine.MockRobinEngine; -import org.elasticsearch.test.store.mock.MockDirectoryHelper; +import org.elasticsearch.test.store.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 2756ba8bde1..7d47c59259a 100644 --- a/src/test/java/org/elasticsearch/test/TestCluster.java +++ b/src/test/java/org/elasticsearch/test/TestCluster.java @@ -51,7 +51,7 @@ import org.elasticsearch.index.engine.IndexEngineModule; 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.test.store.MockFSIndexStoreModule; import org.elasticsearch.test.transport.AssertingLocalTransportModule; import org.elasticsearch.transport.TransportModule; import org.elasticsearch.transport.TransportService; diff --git a/src/test/java/org/elasticsearch/test/store/mock/MockDirectoryHelper.java b/src/test/java/org/elasticsearch/test/store/MockDirectoryHelper.java similarity index 99% rename from src/test/java/org/elasticsearch/test/store/mock/MockDirectoryHelper.java rename to src/test/java/org/elasticsearch/test/store/MockDirectoryHelper.java index 6cdc31dca05..73ffe4d3289 100644 --- a/src/test/java/org/elasticsearch/test/store/mock/MockDirectoryHelper.java +++ b/src/test/java/org/elasticsearch/test/store/MockDirectoryHelper.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.store.mock; +package org.elasticsearch.test.store; import com.carrotsearch.randomizedtesting.SeedUtils; import org.apache.lucene.store.*; diff --git a/src/test/java/org/elasticsearch/test/store/mock/MockFSDirectoryService.java b/src/test/java/org/elasticsearch/test/store/MockFSDirectoryService.java similarity index 98% rename from src/test/java/org/elasticsearch/test/store/mock/MockFSDirectoryService.java rename to src/test/java/org/elasticsearch/test/store/MockFSDirectoryService.java index a20a6586090..52eee6da5a6 100644 --- a/src/test/java/org/elasticsearch/test/store/mock/MockFSDirectoryService.java +++ b/src/test/java/org/elasticsearch/test/store/MockFSDirectoryService.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.store.mock; +package org.elasticsearch.test.store; import org.apache.lucene.store.Directory; import org.apache.lucene.store.FSDirectory; diff --git a/src/test/java/org/elasticsearch/test/store/mock/MockFSIndexStore.java b/src/test/java/org/elasticsearch/test/store/MockFSIndexStore.java similarity index 97% rename from src/test/java/org/elasticsearch/test/store/mock/MockFSIndexStore.java rename to src/test/java/org/elasticsearch/test/store/MockFSIndexStore.java index 120e85a8b12..7ab5aa1910a 100644 --- a/src/test/java/org/elasticsearch/test/store/mock/MockFSIndexStore.java +++ b/src/test/java/org/elasticsearch/test/store/MockFSIndexStore.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.store.mock; +package org.elasticsearch.test.store; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.Settings; diff --git a/src/test/java/org/elasticsearch/test/store/mock/MockFSIndexStoreModule.java b/src/test/java/org/elasticsearch/test/store/MockFSIndexStoreModule.java similarity index 96% rename from src/test/java/org/elasticsearch/test/store/mock/MockFSIndexStoreModule.java rename to src/test/java/org/elasticsearch/test/store/MockFSIndexStoreModule.java index 27dc9b68b78..b5fb01806d7 100644 --- a/src/test/java/org/elasticsearch/test/store/mock/MockFSIndexStoreModule.java +++ b/src/test/java/org/elasticsearch/test/store/MockFSIndexStoreModule.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.store.mock; +package org.elasticsearch.test.store; import org.elasticsearch.common.inject.AbstractModule; import org.elasticsearch.index.store.IndexStore; diff --git a/src/test/java/org/elasticsearch/test/store/mock/MockRamDirecorySerivce.java b/src/test/java/org/elasticsearch/test/store/MockRamDirecorySerivce.java similarity index 98% rename from src/test/java/org/elasticsearch/test/store/mock/MockRamDirecorySerivce.java rename to src/test/java/org/elasticsearch/test/store/MockRamDirecorySerivce.java index 4f4098acc73..b000df98253 100644 --- a/src/test/java/org/elasticsearch/test/store/mock/MockRamDirecorySerivce.java +++ b/src/test/java/org/elasticsearch/test/store/MockRamDirecorySerivce.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.store.mock; +package org.elasticsearch.test.store; import org.apache.lucene.store.Directory; import org.elasticsearch.cache.memory.ByteBufferCache; diff --git a/src/test/java/org/elasticsearch/test/store/mock/MockRamIndexStore.java b/src/test/java/org/elasticsearch/test/store/MockRamIndexStore.java similarity index 97% rename from src/test/java/org/elasticsearch/test/store/mock/MockRamIndexStore.java rename to src/test/java/org/elasticsearch/test/store/MockRamIndexStore.java index 09bfe3e7ec3..3c653c36806 100644 --- a/src/test/java/org/elasticsearch/test/store/mock/MockRamIndexStore.java +++ b/src/test/java/org/elasticsearch/test/store/MockRamIndexStore.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.store.mock; +package org.elasticsearch.test.store; import org.elasticsearch.common.inject.Inject; diff --git a/src/test/java/org/elasticsearch/test/store/mock/MockRamIndexStoreModule.java b/src/test/java/org/elasticsearch/test/store/MockRamIndexStoreModule.java similarity index 96% rename from src/test/java/org/elasticsearch/test/store/mock/MockRamIndexStoreModule.java rename to src/test/java/org/elasticsearch/test/store/MockRamIndexStoreModule.java index 7ccfe58cf96..d4a7905d8e1 100644 --- a/src/test/java/org/elasticsearch/test/store/mock/MockRamIndexStoreModule.java +++ b/src/test/java/org/elasticsearch/test/store/MockRamIndexStoreModule.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.store.mock; +package org.elasticsearch.test.store; import org.elasticsearch.common.inject.AbstractModule; import org.elasticsearch.index.store.IndexStore;