diff --git a/community/consistency-check/src/test/java/org/neo4j/consistency/ConsistencyCheckToolTest.java b/community/consistency-check/src/test/java/org/neo4j/consistency/ConsistencyCheckToolTest.java index 313ae8c0d3e5..582e6a679851 100644 --- a/community/consistency-check/src/test/java/org/neo4j/consistency/ConsistencyCheckToolTest.java +++ b/community/consistency-check/src/test/java/org/neo4j/consistency/ConsistencyCheckToolTest.java @@ -40,7 +40,7 @@ import org.neo4j.logging.LogProvider; import org.neo4j.test.TestGraphDatabaseFactory; import org.neo4j.test.rule.TargetDirectory; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import org.neo4j.test.rule.system.SystemExitRule; import static org.hamcrest.CoreMatchers.containsString; @@ -56,7 +56,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.neo4j.graphdb.Label.label; -import static org.neo4j.test.rule.filesystem.EphemeralFileSystemRule.shutdownDbAction; +import static org.neo4j.test.rule.fs.EphemeralFileSystemRule.shutdownDbAction; public class ConsistencyCheckToolTest { diff --git a/community/kernel/src/test/java/examples/BatchInsertDocTest.java b/community/kernel/src/test/java/examples/BatchInsertDocTest.java index 6d48c639c792..f81003f4e5b5 100644 --- a/community/kernel/src/test/java/examples/BatchInsertDocTest.java +++ b/community/kernel/src/test/java/examples/BatchInsertDocTest.java @@ -44,7 +44,7 @@ import org.neo4j.helpers.collection.MapUtil; import org.neo4j.io.fs.DefaultFileSystemAbstraction; import org.neo4j.io.fs.FileUtils; -import org.neo4j.test.rule.filesystem.DefaultFileSystemRule; +import org.neo4j.test.rule.fs.DefaultFileSystemRule; import org.neo4j.unsafe.batchinsert.BatchInserter; import org.neo4j.unsafe.batchinsert.BatchInserters; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/NeoStoreDataSourceTest.java b/community/kernel/src/test/java/org/neo4j/kernel/NeoStoreDataSourceTest.java index ffc45e1e6c10..cc88bd7312a8 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/NeoStoreDataSourceTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/NeoStoreDataSourceTest.java @@ -39,7 +39,7 @@ import org.neo4j.test.rule.NeoStoreDataSourceRule; import org.neo4j.test.rule.PageCacheRule; import org.neo4j.test.rule.TargetDirectory; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/LegacyBatchIndexApplierTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/LegacyBatchIndexApplierTest.java index ce03dfeaa659..69f12a7700fa 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/LegacyBatchIndexApplierTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/LegacyBatchIndexApplierTest.java @@ -44,7 +44,7 @@ import org.neo4j.kernel.impl.util.SynchronizedArrayIdOrderingQueue; import org.neo4j.kernel.lifecycle.LifeRule; import org.neo4j.test.Race; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.junit.Assert.assertTrue; import static org.mockito.Matchers.anyBoolean; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexCRUDIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexCRUDIT.java index 56fbfe52c9e9..365b7c3e237e 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexCRUDIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexCRUDIT.java @@ -57,7 +57,7 @@ import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.storageengine.api.schema.IndexSample; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexRecoveryIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexRecoveryIT.java index 2d892c7cb6e2..ba6911bbab47 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexRecoveryIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexRecoveryIT.java @@ -64,7 +64,7 @@ import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.storageengine.api.schema.IndexSample; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static java.util.concurrent.Executors.newSingleThreadExecutor; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexRestartIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexRestartIT.java index 3f793b3d6529..fe2d57def756 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexRestartIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexRestartIT.java @@ -36,7 +36,7 @@ import org.neo4j.kernel.extension.KernelExtensionFactory; import org.neo4j.test.DoubleLatch; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertEquals; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexStatisticsIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexStatisticsIT.java index 5821fc0a778d..b7c37201e546 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexStatisticsIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexStatisticsIT.java @@ -45,7 +45,7 @@ import org.neo4j.logging.AssertableLogProvider; import org.neo4j.register.Register.DoubleLongRegister; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.junit.Assert.assertEquals; import static org.neo4j.graphdb.Label.label; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/PropertyPhysicalToLogicalConverterTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/PropertyPhysicalToLogicalConverterTest.java index e6610da0b0ec..cfdd5e0de53a 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/PropertyPhysicalToLogicalConverterTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/PropertyPhysicalToLogicalConverterTest.java @@ -44,7 +44,7 @@ import org.neo4j.kernel.impl.transaction.state.PropertyRecordChange; import org.neo4j.logging.NullLogProvider; import org.neo4j.test.rule.PageCacheRule; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.junit.Assert.assertEquals; import static org.neo4j.helpers.collection.Iterables.asList; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StorePropertyCursorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StorePropertyCursorTest.java index a640810b502b..7af71e04cc12 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StorePropertyCursorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StorePropertyCursorTest.java @@ -57,7 +57,7 @@ import org.neo4j.logging.NullLogProvider; import org.neo4j.storageengine.api.PropertyItem; import org.neo4j.test.rule.PageCacheRule; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/LargePropertiesIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/LargePropertiesIT.java index d42f5c90f5e6..08b187fda1ed 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/LargePropertiesIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/LargePropertiesIT.java @@ -28,7 +28,7 @@ import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.factory.GraphDatabaseSettings; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestCrashWithRebuildSlow.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestCrashWithRebuildSlow.java index a99c28613f8a..faaa7729672c 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestCrashWithRebuildSlow.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestCrashWithRebuildSlow.java @@ -50,7 +50,7 @@ import org.neo4j.test.TestGraphDatabaseFactory; import org.neo4j.test.rule.TargetDirectory; import org.neo4j.test.rule.TargetDirectory.TestDirectory; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.Matchers.greaterThanOrEqualTo; @@ -60,7 +60,7 @@ import static org.neo4j.kernel.configuration.Settings.FALSE; import static org.neo4j.test.mockito.matcher.Neo4jMatchers.hasProperty; import static org.neo4j.test.mockito.matcher.Neo4jMatchers.inTx; -import static org.neo4j.test.rule.filesystem.EphemeralFileSystemRule.shutdownDbAction; +import static org.neo4j.test.rule.fs.EphemeralFileSystemRule.shutdownDbAction; /** * Test for making sure that slow id generator rebuild is exercised diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestIdReuse.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestIdReuse.java index 43e8479dc9ce..99ad3c5413c8 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestIdReuse.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestIdReuse.java @@ -28,7 +28,7 @@ import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.junit.Assert.assertEquals; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestReadOnlyNeo4j.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestReadOnlyNeo4j.java index 83550cdcd525..7915f97cd5c0 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestReadOnlyNeo4j.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestReadOnlyNeo4j.java @@ -37,7 +37,7 @@ import org.neo4j.kernel.configuration.Settings; import org.neo4j.test.DbRepresentation; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.hamcrest.CoreMatchers.instanceOf; import static org.junit.Assert.assertEquals; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/coreapi/schema/SchemaImplTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/coreapi/schema/SchemaImplTest.java index 8a3a789e96be..bbb4b91406b7 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/coreapi/schema/SchemaImplTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/coreapi/schema/SchemaImplTest.java @@ -36,7 +36,7 @@ import org.neo4j.graphdb.schema.Schema; import org.neo4j.helpers.collection.Iterables; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/TestIndexImplOnNeo.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/TestIndexImplOnNeo.java index 135c7f59bfbd..d4e582f931a5 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/TestIndexImplOnNeo.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/TestIndexImplOnNeo.java @@ -33,7 +33,7 @@ import org.neo4j.graphdb.index.Index; import org.neo4j.helpers.collection.Iterables; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/pagecache/ConfiguringPageCacheFactoryTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/pagecache/ConfiguringPageCacheFactoryTest.java index 4c52d6f15099..5c39500717e8 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/pagecache/ConfiguringPageCacheFactoryTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/pagecache/ConfiguringPageCacheFactoryTest.java @@ -32,7 +32,7 @@ import org.neo4j.io.pagecache.tracing.PageCacheTracer; import org.neo4j.kernel.configuration.Config; import org.neo4j.logging.NullLog; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/recovery/KernelRecoveryTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/recovery/KernelRecoveryTest.java index 41e2a683bf0a..33ce911c6da6 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/recovery/KernelRecoveryTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/recovery/KernelRecoveryTest.java @@ -33,7 +33,7 @@ import org.neo4j.kernel.impl.transaction.log.LogPosition; import org.neo4j.kernel.impl.transaction.log.PhysicalLogFile; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.hamcrest.MatcherAssert.assertThat; import static org.neo4j.test.mockito.matcher.LogMatchers.checkPoint; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordStorageEngineTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordStorageEngineTest.java index b48364702575..6e7e466ec452 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordStorageEngineTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordStorageEngineTest.java @@ -43,7 +43,7 @@ import org.neo4j.storageengine.api.TransactionApplicationMode; import org.neo4j.test.rule.PageCacheRule; import org.neo4j.test.rule.RecordStorageEngineRule; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.hamcrest.Matchers.sameInstance; import static org.junit.Assert.assertNotNull; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/IdGeneratorImplContractTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/IdGeneratorImplContractTest.java index 1b8e97b3b5de..a2a2209dd9b7 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/IdGeneratorImplContractTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/IdGeneratorImplContractTest.java @@ -29,7 +29,7 @@ import org.neo4j.kernel.impl.AbstractNeo4jTestCase; import org.neo4j.kernel.impl.store.id.IdGenerator; import org.neo4j.kernel.impl.store.id.IdGeneratorImpl; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.junit.Assert.assertTrue; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/IdGeneratorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/IdGeneratorTest.java index c54e5c0a439c..fe284575682b 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/IdGeneratorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/IdGeneratorTest.java @@ -56,7 +56,7 @@ import org.neo4j.kernel.impl.store.record.AbstractBaseRecord; import org.neo4j.test.TestGraphDatabaseFactory; import org.neo4j.test.rule.PageCacheRule; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertEquals; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/MetaDataStoreTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/MetaDataStoreTest.java index e92db7b5bf3c..a3581a692e61 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/MetaDataStoreTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/MetaDataStoreTest.java @@ -49,7 +49,7 @@ import org.neo4j.kernel.impl.store.record.RecordLoad; import org.neo4j.logging.NullLogProvider; import org.neo4j.test.rule.PageCacheRule; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/NeoStoresTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/NeoStoresTest.java index da7819d3f360..7cfa7848464e 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/NeoStoresTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/NeoStoresTest.java @@ -85,7 +85,7 @@ import org.neo4j.test.rule.NeoStoreDataSourceRule; import org.neo4j.test.rule.PageCacheRule; import org.neo4j.test.rule.TargetDirectory; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/NodeStoreTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/NodeStoreTest.java index 84731d4ab67f..75fcf0ea488e 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/NodeStoreTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/NodeStoreTest.java @@ -53,7 +53,7 @@ import org.neo4j.kernel.impl.store.record.NodeRecord; import org.neo4j.logging.NullLogProvider; import org.neo4j.test.rule.PageCacheRule; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static java.util.Arrays.asList; import static org.junit.Assert.assertEquals; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/PropertyKeyTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/PropertyKeyTest.java index a3cb7ce157a0..cc7dd068b900 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/PropertyKeyTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/PropertyKeyTest.java @@ -32,7 +32,7 @@ import org.neo4j.helpers.collection.Iterables; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import org.neo4j.unsafe.batchinsert.BatchInserter; import org.neo4j.unsafe.batchinsert.BatchInserters; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/PropertyStoreTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/PropertyStoreTest.java index b241f5d0b40f..fb993647df1e 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/PropertyStoreTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/PropertyStoreTest.java @@ -41,7 +41,7 @@ import org.neo4j.kernel.impl.store.record.PropertyRecord; import org.neo4j.logging.NullLogProvider; import org.neo4j.test.rule.PageCacheRule; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static java.util.Collections.singletonMap; import static org.junit.Assert.assertFalse; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/SchemaStoreTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/SchemaStoreTest.java index 1de2554b2575..59d8f5f14e2c 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/SchemaStoreTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/SchemaStoreTest.java @@ -40,7 +40,7 @@ import org.neo4j.logging.NullLogProvider; import org.neo4j.storageengine.api.schema.SchemaRule; import org.neo4j.test.rule.PageCacheRule; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static java.nio.ByteBuffer.wrap; import static org.junit.Assert.assertEquals; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestDynamicStore.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestDynamicStore.java index 3f399eafa001..8a8bd19f8b8b 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestDynamicStore.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestDynamicStore.java @@ -45,7 +45,7 @@ import org.neo4j.kernel.impl.store.record.DynamicRecord; import org.neo4j.logging.NullLogProvider; import org.neo4j.test.rule.PageCacheRule; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static java.util.Collections.singletonMap; import static org.junit.Assert.assertEquals; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestGraphProperties.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestGraphProperties.java index 9d7a45375707..c1520b77ec4e 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestGraphProperties.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestGraphProperties.java @@ -43,7 +43,7 @@ import org.neo4j.test.OtherThreadExecutor; import org.neo4j.test.TestGraphDatabaseFactory; import org.neo4j.test.rule.PageCacheRule; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertArrayEquals; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestIdGeneratorRebuilding.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestIdGeneratorRebuilding.java index b5b49b7f355a..32ec41f0faa6 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestIdGeneratorRebuilding.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestIdGeneratorRebuilding.java @@ -41,7 +41,7 @@ import org.neo4j.kernel.impl.store.record.NodeRecord; import org.neo4j.logging.NullLogProvider; import org.neo4j.test.rule.PageCacheRule; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.is; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestStoreAccess.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestStoreAccess.java index 00d7308d6c50..9cd9f1199eb5 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestStoreAccess.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestStoreAccess.java @@ -33,7 +33,7 @@ import org.neo4j.kernel.impl.recovery.RecoveryRequiredChecker; import org.neo4j.test.TestGraphDatabaseFactory; import org.neo4j.test.rule.PageCacheRule; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.junit.Assert.assertTrue; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/counts/CountsComputerTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/counts/CountsComputerTest.java index 7b66d9c86dfc..05aab3c95654 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/counts/CountsComputerTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/counts/CountsComputerTest.java @@ -53,7 +53,7 @@ import org.neo4j.test.TestGraphDatabaseFactory; import org.neo4j.test.rule.PageCacheRule; import org.neo4j.test.rule.TargetDirectory; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.junit.Assert.assertEquals; import static org.neo4j.kernel.impl.store.counts.keys.CountsKeyFactory.nodeKey; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/counts/CountsRotationTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/counts/CountsRotationTest.java index eb744bb87cf1..9f60733e8e6b 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/counts/CountsRotationTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/counts/CountsRotationTest.java @@ -63,7 +63,7 @@ import org.neo4j.test.TestGraphDatabaseFactory; import org.neo4j.test.rule.PageCacheRule; import org.neo4j.test.rule.TargetDirectory; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.hamcrest.Matchers.instanceOf; import static org.junit.Assert.assertEquals; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/format/RecordFormatTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/format/RecordFormatTest.java index 5f72411fbcb9..72d33d1112ca 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/format/RecordFormatTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/format/RecordFormatTest.java @@ -39,7 +39,7 @@ import org.neo4j.kernel.impl.store.record.Record; import org.neo4j.test.rule.PageCacheRule; import org.neo4j.test.rule.RandomRule; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import org.neo4j.unsafe.impl.batchimport.store.BatchingIdSequence; import static java.lang.System.currentTimeMillis; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/id/IdGeneratorImplTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/id/IdGeneratorImplTest.java index 87b6f0eabc88..d4a277279659 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/id/IdGeneratorImplTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/id/IdGeneratorImplTest.java @@ -29,7 +29,7 @@ import org.neo4j.kernel.impl.store.InvalidIdGeneratorException; import org.neo4j.kernel.impl.store.id.validation.IdCapacityExceededException; import org.neo4j.kernel.impl.store.id.validation.NegativeIdException; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static java.util.concurrent.TimeUnit.MINUTES; import static org.hamcrest.Matchers.equalTo; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/kvstore/KeyValueStoreFileFormatTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/kvstore/KeyValueStoreFileFormatTest.java index b7574a37cb44..58a3d8a82c9f 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/kvstore/KeyValueStoreFileFormatTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/kvstore/KeyValueStoreFileFormatTest.java @@ -39,7 +39,7 @@ import org.neo4j.kernel.configuration.Config; import org.neo4j.test.rule.PageCacheRule; import org.neo4j.test.rule.ResourceRule; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/StoreVersionCheckTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/StoreVersionCheckTest.java index c7b25c34b4f6..96a3e7d6990a 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/StoreVersionCheckTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/StoreVersionCheckTest.java @@ -31,7 +31,7 @@ import org.neo4j.kernel.impl.store.MetaDataStore; import org.neo4j.string.UTF8; import org.neo4j.test.rule.PageCacheRule; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/LegacyStoreVersionCheckTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/LegacyStoreVersionCheckTest.java index 3779c04a0c7a..cb7bc206c554 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/LegacyStoreVersionCheckTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/LegacyStoreVersionCheckTest.java @@ -27,7 +27,7 @@ import java.io.OutputStream; import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/checkpoint/CheckPointerIntegrationTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/checkpoint/CheckPointerIntegrationTest.java index c4366660ca2c..f856e7e3e3ac 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/checkpoint/CheckPointerIntegrationTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/checkpoint/CheckPointerIntegrationTest.java @@ -45,7 +45,7 @@ import org.neo4j.kernel.impl.transaction.log.entry.LogEntryReader; import org.neo4j.kernel.impl.transaction.log.entry.VersionAwareLogEntryReader; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static java.lang.System.getProperty; import static org.junit.Assert.assertEquals; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/entry/TestTxEntries.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/entry/TestTxEntries.java index 49bd3f1062ca..ce63963e0f8c 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/entry/TestTxEntries.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/entry/TestTxEntries.java @@ -30,9 +30,9 @@ import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; -import static org.neo4j.test.rule.filesystem.EphemeralFileSystemRule.shutdownDbAction; +import static org.neo4j.test.rule.fs.EphemeralFileSystemRule.shutdownDbAction; public class TestTxEntries { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/ApplyRecoveredTransactionsTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/ApplyRecoveredTransactionsTest.java index 8ebfe62f2243..254df2576c87 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/ApplyRecoveredTransactionsTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/ApplyRecoveredTransactionsTest.java @@ -48,7 +48,7 @@ import org.neo4j.kernel.impl.transaction.log.PhysicalTransactionRepresentation; import org.neo4j.logging.NullLogProvider; import org.neo4j.test.rule.PageCacheRule; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.any; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/NodeCommandTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/NodeCommandTest.java index ddbda2b7a481..cbb5b4baf862 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/NodeCommandTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/NodeCommandTest.java @@ -46,7 +46,7 @@ import org.neo4j.logging.NullLogProvider; import org.neo4j.storageengine.api.CommandReader; import org.neo4j.test.rule.PageCacheRule; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static java.util.Collections.singletonList; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/NodeLabelsFieldTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/NodeLabelsFieldTest.java index 4d06be8c5e73..b6450ba9c146 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/NodeLabelsFieldTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/NodeLabelsFieldTest.java @@ -54,7 +54,7 @@ import org.neo4j.logging.NullLogProvider; import org.neo4j.test.rule.PageCacheRule; import org.neo4j.test.rule.RandomRule; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/RelationshipGroupGetterTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/RelationshipGroupGetterTest.java index 1be08c75823e..ebe754fa4d5e 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/RelationshipGroupGetterTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/RelationshipGroupGetterTest.java @@ -37,7 +37,7 @@ import org.neo4j.kernel.impl.transaction.state.RelationshipGroupGetter.RelationshipGroupPosition; import org.neo4j.logging.NullLogProvider; import org.neo4j.test.rule.PageCacheRule; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import org.neo4j.unsafe.batchinsert.DirectRecordAccess; import static org.junit.Assert.assertEquals; diff --git a/community/kernel/src/test/java/org/neo4j/test/rule/Resources.java b/community/kernel/src/test/java/org/neo4j/test/rule/Resources.java index cbb34b45ad61..fc3edc6ff410 100644 --- a/community/kernel/src/test/java/org/neo4j/test/rule/Resources.java +++ b/community/kernel/src/test/java/org/neo4j/test/rule/Resources.java @@ -37,7 +37,7 @@ import org.neo4j.kernel.lifecycle.LifecycleException; import org.neo4j.logging.LogProvider; import org.neo4j.logging.NullLogProvider; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.neo4j.test.rule.ResourceRule.existingDirectory; import static org.neo4j.test.rule.ResourceRule.fileInExistingDirectory; diff --git a/community/kernel/src/test/java/org/neo4j/test/rule/filesystem/DefaultFileSystemRule.java b/community/kernel/src/test/java/org/neo4j/test/rule/fs/DefaultFileSystemRule.java similarity index 88% rename from community/kernel/src/test/java/org/neo4j/test/rule/filesystem/DefaultFileSystemRule.java rename to community/kernel/src/test/java/org/neo4j/test/rule/fs/DefaultFileSystemRule.java index 3d9359a5fa9e..c342f4384ee2 100644 --- a/community/kernel/src/test/java/org/neo4j/test/rule/filesystem/DefaultFileSystemRule.java +++ b/community/kernel/src/test/java/org/neo4j/test/rule/fs/DefaultFileSystemRule.java @@ -17,11 +17,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.test.rule.filesystem; +package org.neo4j.test.rule.fs; import org.junit.rules.ExternalResource; -import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.io.fs.DefaultFileSystemAbstraction; public class DefaultFileSystemRule extends ExternalResource @@ -57,9 +56,4 @@ public void clear() { fs = new DefaultFileSystemAbstraction(); } - - public static Runnable shutdownDb( final GraphDatabaseService db ) - { - return () -> db.shutdown(); - } } diff --git a/community/kernel/src/test/java/org/neo4j/test/rule/filesystem/EphemeralFileSystemRule.java b/community/kernel/src/test/java/org/neo4j/test/rule/fs/EphemeralFileSystemRule.java similarity index 97% rename from community/kernel/src/test/java/org/neo4j/test/rule/filesystem/EphemeralFileSystemRule.java rename to community/kernel/src/test/java/org/neo4j/test/rule/fs/EphemeralFileSystemRule.java index 03df64b540d1..59d1a74609fe 100644 --- a/community/kernel/src/test/java/org/neo4j/test/rule/filesystem/EphemeralFileSystemRule.java +++ b/community/kernel/src/test/java/org/neo4j/test/rule/fs/EphemeralFileSystemRule.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.test.rule.filesystem; +package org.neo4j.test.rule.fs; import org.junit.rules.ExternalResource; diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/batchinsert/BigBatchStoreIT.java b/community/kernel/src/test/java/org/neo4j/unsafe/batchinsert/BigBatchStoreIT.java index b8ed3dd24977..b1bca8d7ebba 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/batchinsert/BigBatchStoreIT.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/batchinsert/BigBatchStoreIT.java @@ -38,7 +38,7 @@ import org.neo4j.kernel.impl.store.id.IdType; import org.neo4j.kernel.impl.store.id.validation.ReservedIdException; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import org.neo4j.unsafe.batchinsert.internal.BatchInserterImpl; import static java.lang.Math.pow; diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/PropertyEncoderStepTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/PropertyEncoderStepTest.java index f5a900641c0a..216de613b9a6 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/PropertyEncoderStepTest.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/PropertyEncoderStepTest.java @@ -34,7 +34,7 @@ import org.neo4j.kernel.impl.store.record.NodeRecord; import org.neo4j.logging.NullLogProvider; import org.neo4j.test.rule.PageCacheRule; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import org.neo4j.unsafe.impl.batchimport.input.InputNode; import org.neo4j.unsafe.impl.batchimport.staging.StageControl; import org.neo4j.unsafe.impl.batchimport.staging.Step; diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/cache/NumberArrayTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/cache/NumberArrayTest.java index 014abc2c5576..5c8ddb3c0f66 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/cache/NumberArrayTest.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/cache/NumberArrayTest.java @@ -33,10 +33,9 @@ import java.util.Map; import java.util.function.Function; -import org.neo4j.test.RandomRule; +import org.neo4j.test.rule.RandomRule; import static org.junit.Assert.assertEquals; - import static org.neo4j.helpers.ArrayUtil.array; import static org.neo4j.unsafe.impl.batchimport.cache.NumberArrayFactory.AUTO; import static org.neo4j.unsafe.impl.batchimport.cache.NumberArrayFactory.CHUNKED_FIXED_SIZE; diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/input/BadCollectorTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/input/BadCollectorTest.java index a7fc616bb5dd..8e9c87b3f38a 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/input/BadCollectorTest.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/input/BadCollectorTest.java @@ -29,7 +29,7 @@ import org.neo4j.collection.primitive.PrimitiveLongCollections; import org.neo4j.collection.primitive.PrimitiveLongSet; import org.neo4j.io.fs.FileSystemAbstraction; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/store/BatchingNeoStoresTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/store/BatchingNeoStoresTest.java index 3718afab7d07..6f238d8807ce 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/store/BatchingNeoStoresTest.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/store/BatchingNeoStoresTest.java @@ -33,7 +33,7 @@ import org.neo4j.kernel.impl.store.format.lowlimit.LowLimitV3_0; import org.neo4j.test.TestGraphDatabaseFactory; import org.neo4j.test.rule.PageCacheRule; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertEquals; diff --git a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/LuceneCommandApplierTest.java b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/LuceneCommandApplierTest.java index 17abfe907e91..1a728a1c53ab 100644 --- a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/LuceneCommandApplierTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/LuceneCommandApplierTest.java @@ -33,7 +33,7 @@ import org.neo4j.kernel.impl.index.IndexConfigStore; import org.neo4j.kernel.impl.index.IndexDefineCommand; import org.neo4j.kernel.lifecycle.LifeRule; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.mockito.Matchers.any; import static org.mockito.Mockito.spy; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/storage/FailureStorageTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/storage/FailureStorageTest.java index 091f0e3e5752..8fedc3570a40 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/storage/FailureStorageTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/storage/FailureStorageTest.java @@ -26,7 +26,7 @@ import java.io.File; import org.neo4j.kernel.api.impl.index.storage.layout.IndexFolderLayout; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static java.lang.String.format; import static org.junit.Assert.assertEquals; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/storage/PartitionedIndexStorageTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/storage/PartitionedIndexStorageTest.java index 54e8204e2e31..c10d9c826f83 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/storage/PartitionedIndexStorageTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/storage/PartitionedIndexStorageTest.java @@ -44,7 +44,7 @@ import org.neo4j.io.fs.StoreChannel; import org.neo4j.kernel.api.impl.index.IndexWriterConfigs; import org.neo4j.test.rule.TargetDirectory; -import org.neo4j.test.rule.filesystem.DefaultFileSystemRule; +import org.neo4j.test.rule.fs.DefaultFileSystemRule; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexRecoveryIT.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexRecoveryIT.java index cc5d661f258d..07183473bb4e 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexRecoveryIT.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexRecoveryIT.java @@ -45,7 +45,7 @@ import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.lifecycle.Lifecycle; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexCorruptionTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexCorruptionTest.java index f808353418cb..bb82b341ae58 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexCorruptionTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexCorruptionTest.java @@ -34,7 +34,7 @@ import org.neo4j.kernel.api.impl.index.storage.PartitionedIndexStorage; import org.neo4j.kernel.api.index.InternalIndexState; import org.neo4j.test.rule.TargetDirectory; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static java.util.Collections.singletonList; import static org.hamcrest.Matchers.instanceOf; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexPopulatorTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexPopulatorTest.java index 39dce79437d8..5a300efe497a 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexPopulatorTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexPopulatorTest.java @@ -49,7 +49,7 @@ import org.neo4j.kernel.impl.api.index.IndexStoreView; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.test.rule.TargetDirectory; -import org.neo4j.test.rule.filesystem.DefaultFileSystemRule; +import org.neo4j.test.rule.fs.DefaultFileSystemRule; import static java.lang.Long.parseLong; import static java.util.Arrays.asList; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexTest.java index 419343faeaca..0c84277abd0b 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexTest.java @@ -32,7 +32,7 @@ import org.neo4j.io.IOUtils; import org.neo4j.kernel.api.impl.index.storage.DirectoryFactory; import org.neo4j.test.rule.TargetDirectory; -import org.neo4j.test.rule.filesystem.DefaultFileSystemRule; +import org.neo4j.test.rule.fs.DefaultFileSystemRule; import static org.junit.Assert.assertTrue; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/SchemaIndexAcceptanceTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/SchemaIndexAcceptanceTest.java index b05f0b79d833..81e92692063a 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/SchemaIndexAcceptanceTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/SchemaIndexAcceptanceTest.java @@ -34,7 +34,7 @@ import org.neo4j.graphdb.schema.IndexDefinition; import org.neo4j.graphdb.schema.Schema.IndexState; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.junit.Assert.assertThat; import static org.neo4j.graphdb.Label.label; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintRecoveryIT.java b/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintRecoveryIT.java index 42bde8324858..ebc29fd3d628 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintRecoveryIT.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintRecoveryIT.java @@ -38,7 +38,7 @@ import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.monitoring.Monitors; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceIntegrationTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceIntegrationTest.java index 18bdac15c816..bf3fb47024ae 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceIntegrationTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceIntegrationTest.java @@ -46,7 +46,7 @@ import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.storageengine.api.schema.PopulationProgress; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.junit.Assert.assertEquals; diff --git a/community/neo4j/src/test/java/counts/RebuildCountsTest.java b/community/neo4j/src/test/java/counts/RebuildCountsTest.java index 07b23ce64f07..68f938381c15 100644 --- a/community/neo4j/src/test/java/counts/RebuildCountsTest.java +++ b/community/neo4j/src/test/java/counts/RebuildCountsTest.java @@ -45,7 +45,7 @@ import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.logging.AssertableLogProvider; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/community/neo4j/src/test/java/recovery/CountsStoreRecoveryTest.java b/community/neo4j/src/test/java/recovery/CountsStoreRecoveryTest.java index 8692e0189a2c..a07eb9f2b316 100644 --- a/community/neo4j/src/test/java/recovery/CountsStoreRecoveryTest.java +++ b/community/neo4j/src/test/java/recovery/CountsStoreRecoveryTest.java @@ -41,11 +41,11 @@ import org.neo4j.kernel.impl.transaction.log.checkpoint.SimpleTriggerInfo; import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.junit.Assert.assertEquals; import static org.neo4j.graphdb.Label.label; -import static org.neo4j.test.rule.filesystem.EphemeralFileSystemRule.shutdownDbAction; +import static org.neo4j.test.rule.fs.EphemeralFileSystemRule.shutdownDbAction; public class CountsStoreRecoveryTest { diff --git a/community/neo4j/src/test/java/recovery/TestRecoveryScenarios.java b/community/neo4j/src/test/java/recovery/TestRecoveryScenarios.java index 0a4f12ed63d7..3b2fb881489d 100644 --- a/community/neo4j/src/test/java/recovery/TestRecoveryScenarios.java +++ b/community/neo4j/src/test/java/recovery/TestRecoveryScenarios.java @@ -49,14 +49,14 @@ import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.storageengine.api.StorageEngine; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static java.util.concurrent.TimeUnit.SECONDS; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; import static org.neo4j.graphdb.Label.label; import static org.neo4j.register.Registers.newDoubleLongRegister; -import static org.neo4j.test.rule.filesystem.EphemeralFileSystemRule.shutdownDbAction; +import static org.neo4j.test.rule.fs.EphemeralFileSystemRule.shutdownDbAction; /** diff --git a/community/shell/src/test/java/org/neo4j/shell/AbstractShellTest.java b/community/shell/src/test/java/org/neo4j/shell/AbstractShellTest.java index b63352c591a5..a751517e98fe 100644 --- a/community/shell/src/test/java/org/neo4j/shell/AbstractShellTest.java +++ b/community/shell/src/test/java/org/neo4j/shell/AbstractShellTest.java @@ -42,7 +42,7 @@ import org.neo4j.shell.impl.SimpleAppServer; import org.neo4j.shell.kernel.GraphDatabaseShellServer; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static java.lang.Integer.parseInt; import static java.util.regex.Pattern.compile; diff --git a/enterprise/com/src/test/java/org/neo4j/com/storecopy/ResponsePackerIT.java b/enterprise/com/src/test/java/org/neo4j/com/storecopy/ResponsePackerIT.java index b1fbf77ef372..70e012c4b62c 100644 --- a/enterprise/com/src/test/java/org/neo4j/com/storecopy/ResponsePackerIT.java +++ b/enterprise/com/src/test/java/org/neo4j/com/storecopy/ResponsePackerIT.java @@ -41,7 +41,7 @@ import org.neo4j.kernel.monitoring.Monitors; import org.neo4j.logging.NullLogProvider; import org.neo4j.test.rule.PageCacheRule; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/RaftLogDurabilityTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/RaftLogDurabilityTest.java index 073b4a793a6d..97079faefd84 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/RaftLogDurabilityTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/RaftLogDurabilityTest.java @@ -38,7 +38,7 @@ import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.kernel.internal.DatabaseHealth; import org.neo4j.logging.NullLogProvider; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/RaftLogVerificationIT.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/RaftLogVerificationIT.java index 21b968bde87f..5e372aebf0a9 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/RaftLogVerificationIT.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/RaftLogVerificationIT.java @@ -26,7 +26,7 @@ import java.util.concurrent.ThreadLocalRandom; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.junit.Assert.assertEquals; import static org.neo4j.coreedge.raft.ReplicatedInteger.valueOf; diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/OnDiskLastTxIdGetterTest.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/OnDiskLastTxIdGetterTest.java index 8f3a3e5bdb15..77761787f3e0 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/OnDiskLastTxIdGetterTest.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/OnDiskLastTxIdGetterTest.java @@ -32,7 +32,7 @@ import org.neo4j.kernel.impl.transaction.log.TransactionIdStore; import org.neo4j.logging.NullLogProvider; import org.neo4j.test.rule.PageCacheRule; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.junit.Assert.assertEquals; diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/TestMasterCommittingAtSlave.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/TestMasterCommittingAtSlave.java index f7a66c2b5b0f..03d321442f34 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/TestMasterCommittingAtSlave.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/TestMasterCommittingAtSlave.java @@ -36,8 +36,6 @@ import org.neo4j.com.TransactionStreamResponse; import org.neo4j.helpers.Exceptions; import org.neo4j.helpers.collection.MapUtil; -import org.neo4j.io.fs.DefaultFileSystemAbstraction; -import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.ha.com.master.Slave; import org.neo4j.kernel.ha.com.master.SlavePriorities; @@ -68,7 +66,6 @@ public class TestMasterCommittingAtSlave @Rule public final CleanupRule cleanup = new CleanupRule(); private static final int MasterServerId = 0; - private static final FileSystemAbstraction FS = new DefaultFileSystemAbstraction(); private Iterable slaves; private AssertableLogProvider logProvider = new AssertableLogProvider(); diff --git a/enterprise/query-logging/src/test/java/org/neo4j/kernel/impl/query/QueryLoggerIT.java b/enterprise/query-logging/src/test/java/org/neo4j/kernel/impl/query/QueryLoggerIT.java index 6ac74c5bbaea..9a61d2cb97a2 100644 --- a/enterprise/query-logging/src/test/java/org/neo4j/kernel/impl/query/QueryLoggerIT.java +++ b/enterprise/query-logging/src/test/java/org/neo4j/kernel/impl/query/QueryLoggerIT.java @@ -44,7 +44,7 @@ import org.neo4j.logging.AssertableLogProvider; import org.neo4j.test.TestGraphDatabaseFactory; import org.neo4j.test.rule.TargetDirectory; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; diff --git a/packaging/neo4j-desktop/src/test/java/org/neo4j/desktop/runtime/DatabaseActionsTest.java b/packaging/neo4j-desktop/src/test/java/org/neo4j/desktop/runtime/DatabaseActionsTest.java index dc167e9c2311..8953e9b44988 100644 --- a/packaging/neo4j-desktop/src/test/java/org/neo4j/desktop/runtime/DatabaseActionsTest.java +++ b/packaging/neo4j-desktop/src/test/java/org/neo4j/desktop/runtime/DatabaseActionsTest.java @@ -19,23 +19,22 @@ */ package org.neo4j.desktop.runtime; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; + import java.io.File; import java.io.FileWriter; import java.io.IOException; import java.util.Properties; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; - import org.neo4j.desktop.config.Installation; import org.neo4j.desktop.model.DesktopModel; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; - import static org.neo4j.server.configuration.ServerSettings.httpConnector; public class DatabaseActionsTest diff --git a/tools/src/test/java/org/neo4j/tools/txlog/CheckTxLogsTest.java b/tools/src/test/java/org/neo4j/tools/txlog/CheckTxLogsTest.java index 9ed74c6f0495..dae9f425fdc0 100644 --- a/tools/src/test/java/org/neo4j/tools/txlog/CheckTxLogsTest.java +++ b/tools/src/test/java/org/neo4j/tools/txlog/CheckTxLogsTest.java @@ -49,7 +49,7 @@ import org.neo4j.kernel.impl.transaction.log.entry.LogEntryWriter; import org.neo4j.kernel.impl.transaction.log.entry.LogHeaderWriter; import org.neo4j.test.rule.SuppressOutput; -import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse;