diff --git a/community/command-line/src/test/java/org/neo4j/commandline/admin/ImportCommandTest.java b/community/command-line/src/test/java/org/neo4j/commandline/admin/ImportCommandTest.java index 51294909799e2..39ab6f46a0e0c 100644 --- a/community/command-line/src/test/java/org/neo4j/commandline/admin/ImportCommandTest.java +++ b/community/command-line/src/test/java/org/neo4j/commandline/admin/ImportCommandTest.java @@ -31,7 +31,7 @@ import org.neo4j.kernel.impl.util.Validators; import org.neo4j.test.rule.DatabaseRule; import org.neo4j.test.rule.EmbeddedDatabaseRule; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.core.IsNot.not; @@ -41,7 +41,7 @@ public class ImportCommandTest { - private TargetDirectory.TestDirectory testDir = TargetDirectory.testDirForTest( getClass() ); + private TestDirectory testDir = TestDirectory.testDirectory(); @Rule public final DatabaseRule db = new EmbeddedDatabaseRule(); diff --git a/community/consistency-check/src/test/java/org/neo4j/consistency/ConsistencyCheckServiceIntegrationTest.java b/community/consistency-check/src/test/java/org/neo4j/consistency/ConsistencyCheckServiceIntegrationTest.java index fc80e462bdfd8..edaf005f12e30 100644 --- a/community/consistency-check/src/test/java/org/neo4j/consistency/ConsistencyCheckServiceIntegrationTest.java +++ b/community/consistency-check/src/test/java/org/neo4j/consistency/ConsistencyCheckServiceIntegrationTest.java @@ -48,7 +48,7 @@ import org.neo4j.kernel.impl.store.record.NodeRecord; import org.neo4j.logging.NullLogProvider; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -75,7 +75,7 @@ protected void generateInitialData( GraphDatabaseService graphDb ) } }; - private final TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + private final TestDirectory testDirectory = TestDirectory.testDirectory(); @Rule public final RuleChain chain = RuleChain.outerRule( testDirectory ).around( fixture ); 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 2d6019273045b..82c6659c321f0 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 @@ -38,9 +38,8 @@ import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.kernel.configuration.Config; import org.neo4j.logging.LogProvider; - import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.hamcrest.CoreMatchers.containsString; @@ -60,7 +59,7 @@ public class ConsistencyCheckToolTest { - private TargetDirectory.TestDirectory storeDirectory = TargetDirectory.testDirForTest( getClass() ); + private TestDirectory storeDirectory = TestDirectory.testDirectory(); private EphemeralFileSystemRule fs = new EphemeralFileSystemRule(); @Rule diff --git a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/GraphStoreFixture.java b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/GraphStoreFixture.java index d6ae82124195f..5448cbf7a4c3f 100644 --- a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/GraphStoreFixture.java +++ b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/GraphStoreFixture.java @@ -79,7 +79,7 @@ import org.neo4j.storageengine.api.schema.SchemaRule; import org.neo4j.test.TestGraphDatabaseFactory; import org.neo4j.test.rule.PageCacheRule; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static java.lang.System.currentTimeMillis; import static org.neo4j.consistency.ConsistencyCheckService.defaultConsistencyCheckThreadsNumber; @@ -491,7 +491,7 @@ private void generateInitialData() @Override public Statement apply( final Statement base, Description description ) { - final TargetDirectory.TestDirectory directory = TargetDirectory.testDirForTest( description.getTestClass() ); + final TestDirectory directory = TestDirectory.testDirectory( description.getTestClass() ); return super.apply( directory.apply( new Statement() { @Override diff --git a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/DetectAllRelationshipInconsistenciesIT.java b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/DetectAllRelationshipInconsistenciesIT.java index 764386e045a94..6c9ee63da7ce7 100644 --- a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/DetectAllRelationshipInconsistenciesIT.java +++ b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/DetectAllRelationshipInconsistenciesIT.java @@ -53,7 +53,7 @@ import org.neo4j.logging.AssertableLogProvider; import org.neo4j.logging.NullLogProvider; import org.neo4j.test.rule.RandomRule; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertTrue; import static org.neo4j.graphdb.Label.label; @@ -61,7 +61,7 @@ public class DetectAllRelationshipInconsistenciesIT { - private final TargetDirectory.TestDirectory directory = TargetDirectory.testDirForTest( getClass() ); + private final TestDirectory directory = TestDirectory.testDirectory(); private final RandomRule random = new RandomRule(); private final DefaultFileSystemAbstraction fileSystem = new DefaultFileSystemAbstraction(); diff --git a/community/consistency-check/src/test/java/org/neo4j/consistency/repair/RelationshipChainExplorerTest.java b/community/consistency-check/src/test/java/org/neo4j/consistency/repair/RelationshipChainExplorerTest.java index 6cb71fe43c2da..3115d3e4547e0 100644 --- a/community/consistency-check/src/test/java/org/neo4j/consistency/repair/RelationshipChainExplorerTest.java +++ b/community/consistency-check/src/test/java/org/neo4j/consistency/repair/RelationshipChainExplorerTest.java @@ -41,7 +41,7 @@ import org.neo4j.kernel.impl.store.record.RelationshipRecord; import org.neo4j.test.TestGraphDatabaseFactory; import org.neo4j.test.rule.PageCacheRule; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertEquals; import static org.neo4j.kernel.impl.store.record.RecordLoad.NORMAL; @@ -53,7 +53,7 @@ public class RelationshipChainExplorerTest @ClassRule public static PageCacheRule pageCacheRule = new PageCacheRule(); @Rule - public TargetDirectory.TestDirectory storeLocation = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory storeLocation = TestDirectory.testDirectory(); private StoreAccess store; @Before diff --git a/community/consistency-check/src/test/java/org/neo4j/unsafe/impl/batchimport/ParallelBatchImporterTest.java b/community/consistency-check/src/test/java/org/neo4j/unsafe/impl/batchimport/ParallelBatchImporterTest.java index 58b9692d1f407..7840238f58da9 100644 --- a/community/consistency-check/src/test/java/org/neo4j/unsafe/impl/batchimport/ParallelBatchImporterTest.java +++ b/community/consistency-check/src/test/java/org/neo4j/unsafe/impl/batchimport/ParallelBatchImporterTest.java @@ -62,7 +62,7 @@ import org.neo4j.test.Randoms; import org.neo4j.test.TestGraphDatabaseFactory; import org.neo4j.test.rule.RandomRule; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import org.neo4j.unsafe.impl.batchimport.cache.idmapping.IdGenerator; import org.neo4j.unsafe.impl.batchimport.cache.idmapping.IdMapper; import org.neo4j.unsafe.impl.batchimport.input.Group; @@ -77,7 +77,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; - import static org.neo4j.helpers.collection.Iterables.count; import static org.neo4j.helpers.collection.Iterators.asSet; import static org.neo4j.helpers.collection.MapUtil.stringMap; @@ -94,7 +93,7 @@ public class ParallelBatchImporterTest { @Rule - public final TargetDirectory.TestDirectory directory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory directory = TestDirectory.testDirectory(); @Rule public final RandomRule random = new RandomRule(); diff --git a/community/graph-algo/src/test/java/org/neo4j/graphalgo/path/AStarPerformanceIT.java b/community/graph-algo/src/test/java/org/neo4j/graphalgo/path/AStarPerformanceIT.java index 2479c530d5d1f..bbdf1e66560b7 100644 --- a/community/graph-algo/src/test/java/org/neo4j/graphalgo/path/AStarPerformanceIT.java +++ b/community/graph-algo/src/test/java/org/neo4j/graphalgo/path/AStarPerformanceIT.java @@ -32,7 +32,7 @@ import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.factory.GraphDatabaseFactory; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static java.lang.System.currentTimeMillis; import static org.neo4j.graphalgo.CommonEvaluators.doubleCostEvaluator; @@ -45,7 +45,7 @@ public class AStarPerformanceIT private File directory; @Rule - public TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory testDirectory = TestDirectory.testDirectory(); @Before public void setup() diff --git a/community/graph-algo/src/test/java/org/neo4j/graphalgo/path/PathExplosionIT.java b/community/graph-algo/src/test/java/org/neo4j/graphalgo/path/PathExplosionIT.java index 08ebe252ac38b..3f0a0baaf19da 100644 --- a/community/graph-algo/src/test/java/org/neo4j/graphalgo/path/PathExplosionIT.java +++ b/community/graph-algo/src/test/java/org/neo4j/graphalgo/path/PathExplosionIT.java @@ -40,7 +40,7 @@ import org.neo4j.graphdb.Transaction; import org.neo4j.io.fs.FileUtils; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static java.lang.System.currentTimeMillis; import static org.junit.Assert.assertTrue; @@ -80,7 +80,7 @@ public void shortestPathShouldFinishWithinToleratedDuration() throws IOException } @Rule - public TargetDirectory.TestDirectory testDir = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory testDir = TestDirectory.testDirectory(); void assertPathFinderCompletesWithinToleratedDuration( long toleratedRuntime, PathFinder pathFinder ) throws IOException diff --git a/community/graph-matching/src/test/java/matching/TestMatchingOfCircularPattern.java b/community/graph-matching/src/test/java/matching/TestMatchingOfCircularPattern.java index 5e56ecabc59cf..0a50c07b33524 100644 --- a/community/graph-matching/src/test/java/matching/TestMatchingOfCircularPattern.java +++ b/community/graph-matching/src/test/java/matching/TestMatchingOfCircularPattern.java @@ -45,7 +45,7 @@ import org.neo4j.graphmatching.PatternNode; import org.neo4j.helpers.collection.IteratorWrapper; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -291,6 +291,5 @@ public static void stopGraphdb() } @ClassRule - public static TargetDirectory.TestDirectory testDirectory = - TargetDirectory.testDirForTest( TestMatchingOfCircularPattern.class ); + public static TestDirectory testDirectory = TestDirectory.testDirectory(); } diff --git a/community/graph-matching/src/test/java/matching/TestPatternMatching.java b/community/graph-matching/src/test/java/matching/TestPatternMatching.java index e38161e6ef53a..ea13d9760f586 100644 --- a/community/graph-matching/src/test/java/matching/TestPatternMatching.java +++ b/community/graph-matching/src/test/java/matching/TestPatternMatching.java @@ -52,7 +52,7 @@ import org.neo4j.test.ProcessStreamHandler; import org.neo4j.test.TestData; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static java.util.Arrays.asList; import static org.junit.Assert.assertEquals; @@ -68,8 +68,7 @@ public GraphDatabaseService graphdb() } @ClassRule - public static TargetDirectory.TestDirectory testDirectory = - TargetDirectory.testDirForTest( TestPatternMatching.class ); + public static TestDirectory testDirectory = TestDirectory.testDirectory(); @Rule public TestData> data = TestData.producedThrough( GraphDescription.createGraphFor( this, true ) ); diff --git a/community/io/src/test/java/org/neo4j/io/fs/FileSystemAbstractionInterruptionTest.java b/community/io/src/test/java/org/neo4j/io/fs/FileSystemAbstractionInterruptionTest.java index 2aceaebb63527..2f56700cec26c 100644 --- a/community/io/src/test/java/org/neo4j/io/fs/FileSystemAbstractionInterruptionTest.java +++ b/community/io/src/test/java/org/neo4j/io/fs/FileSystemAbstractionInterruptionTest.java @@ -35,7 +35,7 @@ import org.neo4j.function.Factory; import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; @@ -45,23 +45,8 @@ @RunWith( Parameterized.class ) public class FileSystemAbstractionInterruptionTest { - private static final Factory ephemeral = new Factory() - { - @Override - public FileSystemAbstraction newInstance() - { - return new EphemeralFileSystemAbstraction(); - } - }; - - private static final Factory real = new Factory() - { - @Override - public FileSystemAbstraction newInstance() - { - return new DefaultFileSystemAbstraction(); - } - }; + private static final Factory ephemeral = EphemeralFileSystemAbstraction::new; + private static final Factory real = DefaultFileSystemAbstraction::new; @Parameterized.Parameters(name = "{0}") public static Iterable dataPoints() @@ -73,8 +58,7 @@ public static Iterable dataPoints() } @Rule - public final TargetDirectory.TestDirectory testdir = - TargetDirectory.testDirForTest( FileSystemAbstractionInterruptionTest.class ); + public final TestDirectory testdir = TestDirectory.testDirectory(); private FileSystemAbstraction fs; private File file; diff --git a/community/io/src/test/java/org/neo4j/io/pagecache/PageSwapperTest.java b/community/io/src/test/java/org/neo4j/io/pagecache/PageSwapperTest.java index 4bbee1e0e0a09..1ffcf8f3c56b0 100644 --- a/community/io/src/test/java/org/neo4j/io/pagecache/PageSwapperTest.java +++ b/community/io/src/test/java/org/neo4j/io/pagecache/PageSwapperTest.java @@ -43,7 +43,7 @@ import java.util.concurrent.atomic.AtomicReference; import org.neo4j.io.pagecache.impl.ByteBufferPage; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.isOneOf; @@ -110,15 +110,16 @@ private File file( String filename ) throws IOException } @Rule - public final TargetDirectory.TestDirectory testDir = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory testDir = TestDirectory.testDirectory(); private final ConcurrentLinkedQueue openedSwappers = new ConcurrentLinkedQueue<>(); @Before @After - public void clearStrayInterrupts() + public void clearStrayInterrupts() throws IOException { Thread.interrupted(); + testDir.cleanup(); } @After diff --git a/community/io/src/test/java/org/neo4j/io/pagecache/harness/MuninnPageCacheHarnessWithRealFileSystemIT.java b/community/io/src/test/java/org/neo4j/io/pagecache/harness/MuninnPageCacheHarnessWithRealFileSystemIT.java index 606cf6b402a00..ca3bedb2bb08a 100644 --- a/community/io/src/test/java/org/neo4j/io/pagecache/harness/MuninnPageCacheHarnessWithRealFileSystemIT.java +++ b/community/io/src/test/java/org/neo4j/io/pagecache/harness/MuninnPageCacheHarnessWithRealFileSystemIT.java @@ -23,12 +23,12 @@ import org.neo4j.io.fs.DefaultFileSystemAbstraction; import org.neo4j.io.pagecache.impl.muninn.MuninnPageCache; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; public class MuninnPageCacheHarnessWithRealFileSystemIT extends MuninnPageCacheHarnessTest { @Rule - public TargetDirectory.TestDirectory directory = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory directory = TestDirectory.testDirectory(); @Override protected Fixture createFixture() diff --git a/community/io/src/test/java/org/neo4j/io/pagecache/impl/muninn/MuninnPageCacheSlowTestWithRealFileSystemIT.java b/community/io/src/test/java/org/neo4j/io/pagecache/impl/muninn/MuninnPageCacheSlowTestWithRealFileSystemIT.java index 20359ef2bb4bf..51b87d93240c9 100644 --- a/community/io/src/test/java/org/neo4j/io/pagecache/impl/muninn/MuninnPageCacheSlowTestWithRealFileSystemIT.java +++ b/community/io/src/test/java/org/neo4j/io/pagecache/impl/muninn/MuninnPageCacheSlowTestWithRealFileSystemIT.java @@ -19,15 +19,24 @@ */ package org.neo4j.io.pagecache.impl.muninn; +import org.junit.After; import org.junit.Rule; +import java.io.IOException; + import org.neo4j.io.fs.DefaultFileSystemAbstraction; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; public class MuninnPageCacheSlowTestWithRealFileSystemIT extends MuninnPageCacheSlowIT { @Rule - public TargetDirectory.TestDirectory directory = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory directory = TestDirectory.testDirectory(); + + @After + public void tearDown() throws IOException + { + directory.cleanup(); + } @Override protected Fixture createFixture() diff --git a/community/io/src/test/java/org/neo4j/io/pagecache/impl/muninn/MuninnPageCacheWithRealFileSystemIT.java b/community/io/src/test/java/org/neo4j/io/pagecache/impl/muninn/MuninnPageCacheWithRealFileSystemIT.java index 1d5761dc7a94b..4691732960f98 100644 --- a/community/io/src/test/java/org/neo4j/io/pagecache/impl/muninn/MuninnPageCacheWithRealFileSystemIT.java +++ b/community/io/src/test/java/org/neo4j/io/pagecache/impl/muninn/MuninnPageCacheWithRealFileSystemIT.java @@ -19,15 +19,24 @@ */ package org.neo4j.io.pagecache.impl.muninn; +import org.junit.After; import org.junit.Rule; +import java.io.IOException; + import org.neo4j.io.fs.DefaultFileSystemAbstraction; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; public class MuninnPageCacheWithRealFileSystemIT extends MuninnPageCacheTest { @Rule - public TargetDirectory.TestDirectory directory = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory directory = TestDirectory.testDirectory(); + + @After + public void tearDown() throws IOException + { + directory.cleanup(); + } @Override protected Fixture createFixture() diff --git a/community/io/src/test/java/org/neo4j/test/Digests.java b/community/io/src/test/java/org/neo4j/test/Digests.java index 2aa84c48639f2..375c50d39ea14 100644 --- a/community/io/src/test/java/org/neo4j/test/Digests.java +++ b/community/io/src/test/java/org/neo4j/test/Digests.java @@ -22,6 +22,8 @@ import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; +import org.neo4j.string.HexString; + public class Digests { public static String md5Hex( String message ) @@ -30,25 +32,11 @@ public static String md5Hex( String message ) { MessageDigest m = MessageDigest.getInstance( "MD5" ); m.update( message.getBytes(), 0, message.getBytes().length); - return hex(m.digest()); + return HexString.encodeHexString( m.digest() ); } catch ( NoSuchAlgorithmException e ) { throw new RuntimeException( "MD5 hash algorithm is not available on this platform: " + e.getMessage(),e ); } } - - protected static final char[] hexArray = "0123456789ABCDEF".toCharArray(); - - // TODO: Replace with BytePrinter#compactHex once auth work is merged - private static String hex(byte[] bytes) - { - char[] hexChars = new char[bytes.length * 2]; - for ( int j = 0; j < bytes.length; j++ ) { - int v = bytes[j] & 0xFF; - hexChars[j * 2] = hexArray[v >>> 4]; - hexChars[j * 2 + 1] = hexArray[v & 0x0F]; - } - return new String(hexChars); - } } diff --git a/community/io/src/test/java/org/neo4j/test/rule/TargetDirectory.java b/community/io/src/test/java/org/neo4j/test/rule/TargetDirectory.java deleted file mode 100644 index c5d882e10edc5..0000000000000 --- a/community/io/src/test/java/org/neo4j/test/rule/TargetDirectory.java +++ /dev/null @@ -1,320 +0,0 @@ -/* - * Copyright (c) 2002-2016 "Neo Technology," - * Network Engine for Objects in Lund AB [http://neotechnology.com] - * - * This file is part of Neo4j. - * - * Neo4j is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.neo4j.test.rule; - -import org.junit.Rule; -import org.junit.rules.TestRule; -import org.junit.runner.Description; -import org.junit.runners.model.Statement; - -import java.io.File; -import java.io.IOException; -import java.net.URISyntaxException; - -import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction; -import org.neo4j.io.fs.DefaultFileSystemAbstraction; -import org.neo4j.io.fs.FileSystemAbstraction; -import org.neo4j.io.fs.FileUtils; -import org.neo4j.test.Digests; - -import static java.lang.String.format; - -public class TargetDirectory -{ - /** - * This class defines a JUnit rule which ensures that the test's working directory is cleaned up. The clean-up - * only happens if the test passes, to help diagnose test failures. For example: - * 
-     *   public class SomeTest
-     *   {
-     *     @Rule
-     *     public TargetDirectory.TestDirectory dir = testDirForTest( getClass() );
-     *
-     *     @Test
-     *     public void shouldDoSomething()
-     *     {
-     *       File storeDir = dir.graphDbDir();
-     *       // do stuff with store dir
-     *     }
-     *   }
-     *
- */ - public class TestDirectory implements TestRule - { - private File subdir = null; - private boolean keepDirectoryAfterSuccefulTest; - - private TestDirectory() { } - - /** - * Tell this {@link Rule} to keep the store directory, even after a successful test. - * It's just a useful debug mechanism to have for analyzing store after a test. - * by default directories aren't kept. - */ - public TestDirectory keepDirectoryAfterSuccefulTest() - { - keepDirectoryAfterSuccefulTest = true; - return this; - } - - public File absolutePath() - { - return directory().getAbsoluteFile(); - } - - public File directory() - { - if ( subdir == null ) - { - throw new IllegalStateException( "Not initialized" ); - } - return subdir; - } - - public File file( String name ) - { - return new File( directory(), name ); - } - - public File directory( String name ) - { - File dir = new File( directory(), name ); - if ( !fileSystem.fileExists( dir ) ) - { - fileSystem.mkdir( dir ); - } - return dir; - } - - public File cleanDirectory( String name ) throws IOException - { - File directory = directory( name ); - for ( File file : fileSystem.listFiles( directory ) ) - { - fileSystem.deleteRecursively( file ); - } - return directory; - } - - public File graphDbDir() - { - return directory( "graph-db" ); - } - - @Override - public Statement apply( final Statement base, final Description description ) - { - return new Statement() - { - @Override - public void evaluate() throws Throwable - { - subdir = directoryForDescription( description ); - boolean success = false; - try - { - base.evaluate(); - success = true; - } - finally - { - complete( success ); - } - } - }; - } - - @Override - public String toString() - { - String subdirName = subdir == null ? "" : subdir.toString(); - return format( "%s[%s]", getClass().getSimpleName(), subdirName ); - } - - private void complete( boolean success ) - { - if ( success && subdir != null && !keepDirectoryAfterSuccefulTest ) - { - try - { - recursiveDelete( subdir ); - } - catch ( RuntimeException e ) - { - if ( e.getCause() != null && - e.getCause() instanceof FileUtils.MaybeWindowsMemoryMappedFileReleaseProblem ) - { - System.err.println( "Failed to delete test directory, maybe due to Windows memory-mapped file problem" ); - } - else - { - throw e; - } - } - } - subdir = null; - } - } - - private final FileSystemAbstraction fileSystem; - private final File base; - - public static TestDirectory testDirForTest( Class owningTest ) - { - return new TargetDirectory( new DefaultFileSystemAbstraction(), owningTest ).testDirectory(); - } - - public static TestDirectory testDirForTest( Class owningTest, FileSystemAbstraction fs ) - { - return new TargetDirectory( fs, owningTest ).testDirectory(); - } - - public static TestDirectory testDirForTestWithEphemeralFS( EphemeralFileSystemAbstraction fileSystem, - Class owningTest ) - { - return new TargetDirectory( fileSystem, owningTest ).testDirectory(); - } - - public TargetDirectory( FileSystemAbstraction fileSystem, Class owningTest ) - { - this.fileSystem = fileSystem; - this.base = new File( new File( locateTarget( owningTest ), "test-data" ), owningTest.getName() ) - .getAbsoluteFile(); - } - - public File cacheDirectory( String name ) - { - File dir = new File( ensureBase(), name ); - if ( ! fileSystem.fileExists( dir ) ) - { - fileSystem.mkdir( dir ); - } - return dir; - } - - public File existingDirectory( String name ) - { - return new File( base, name ); - } - - public File cleanDirectory( String name ) - { - File dir = new File( ensureBase(), name ); - if ( fileSystem.fileExists( dir ) ) - { - recursiveDelete( dir ); - } - fileSystem.mkdir( dir ); - return dir; - } - - public File directoryForDescription( Description description ) - { - String test = description.getMethodName(); - if ( test == null ) - { - test = "static"; - } - String dir = Digests.md5Hex( test ); - register( test, dir ); - return cleanDirectory( dir ); - } - - public File file( String name ) - { - return new File( ensureBase(), name ); - } - - public TestDirectory testDirectory() - { - return new TestDirectory(); - } - - public File makeGraphDbDir() - { - return cleanDirectory( "graph-db" ); - } - - public void cleanup() throws IOException - { - fileSystem.deleteRecursively( base ); - fileSystem.mkdirs( base ); - } - - private void recursiveDelete( File file ) - { - try - { - fileSystem.deleteRecursively( file ); - } - catch ( IOException e ) - { - throw new RuntimeException( e ); - } - } - - private void register( String test, String dir ) - { - try - { - FileUtils.writeToFile( new File( ensureBase(), ".register" ), format( "%s=%s\n", dir, test ), true ); - } - catch ( IOException e ) - { - throw new RuntimeException( e ); - } - } - - private File ensureBase() - { - if ( fileSystem.fileExists( base ) && !fileSystem.isDirectory( base ) ) - { - throw new IllegalStateException( base + " exists and is not a directory!" ); - } - - try - { - fileSystem.mkdirs( base ); - } - catch ( IOException e ) - { - throw new RuntimeException( e ); - } - return base; - } - - private static File locateTarget( Class owningTest ) - { - try - { - File codeSource = new File( owningTest.getProtectionDomain().getCodeSource().getLocation().toURI() ); - if ( codeSource.isDirectory() ) - { - // code loaded from a directory - return codeSource.getParentFile(); - } - } - catch ( URISyntaxException e ) - { - // ignored - } - return new File( "target" ); - } -} diff --git a/community/io/src/test/java/org/neo4j/test/rule/TestDirectory.java b/community/io/src/test/java/org/neo4j/test/rule/TestDirectory.java new file mode 100644 index 0000000000000..b07fac4c159e8 --- /dev/null +++ b/community/io/src/test/java/org/neo4j/test/rule/TestDirectory.java @@ -0,0 +1,304 @@ +/* + * Copyright (c) 2002-2016 "Neo Technology," + * Network Engine for Objects in Lund AB [http://neotechnology.com] + * + * This file is part of Neo4j. + * + * Neo4j is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.neo4j.test.rule; + +import org.junit.Rule; +import org.junit.rules.TestRule; +import org.junit.runner.Description; +import org.junit.runners.model.Statement; + +import java.io.File; +import java.io.IOException; +import java.net.URISyntaxException; + +import org.neo4j.io.fs.DefaultFileSystemAbstraction; +import org.neo4j.io.fs.FileSystemAbstraction; +import org.neo4j.io.fs.FileUtils; +import org.neo4j.io.fs.FileUtils.MaybeWindowsMemoryMappedFileReleaseProblem; +import org.neo4j.test.Digests; + +import static java.lang.String.format; + +/** + * This class defines a JUnit rule which ensures that the test's working directory is cleaned up. The clean-up + * only happens if the test passes, to help diagnose test failures. For example: + * 
+ *   public class SomeTest
+ *   {
+ *     @Rule
+ *     public TestDirectory dir = TestDirectory.testDirectory();
+ *
+ *     @Test
+ *     public void shouldDoSomething()
+ *     {
+ *       File storeDir = dir.graphDbDir();
+ *       // do stuff with store dir
+ *     }
+ *   }
+ *
+ */ +public class TestDirectory implements TestRule +{ + private final FileSystemAbstraction fileSystem; + private File testClassBaseFolder; + private Class owningTest; + private boolean keepDirectoryAfterSuccessfulTest; + private File testDirectory = null; + + private TestDirectory( FileSystemAbstraction fileSystem ) + { + this.fileSystem = fileSystem; + } + + private TestDirectory( FileSystemAbstraction fileSystem, Class owningTest ) + { + this.fileSystem = fileSystem; + this.owningTest = owningTest; + } + + public static TestDirectory testDirectory() + { + return new TestDirectory( new DefaultFileSystemAbstraction() ); + } + + public static TestDirectory testDirectory( FileSystemAbstraction fs ) + { + return new TestDirectory( fs ); + } + + public static TestDirectory testDirectory( Class owningTest ) + { + return new TestDirectory( new DefaultFileSystemAbstraction(), owningTest ); + } + + public static TestDirectory testDirectory( Class owningTest, FileSystemAbstraction fs ) + { + return new TestDirectory( fs, owningTest ); + } + + @Override + public Statement apply( final Statement base, final Description description ) + { + return new Statement() + { + @Override + public void evaluate() throws Throwable + { + testDirectory = directoryForDescription( description ); + boolean success = false; + try + { + base.evaluate(); + success = true; + } + finally + { + complete( success ); + } + } + }; + } + + /** + * Tell this {@link Rule} to keep the store directory, even after a successful test. + * It's just a useful debug mechanism to have for analyzing store after a test. + * by default directories aren't kept. + */ + public TestDirectory keepDirectoryAfterSuccessfulTest() + { + keepDirectoryAfterSuccessfulTest = true; + return this; + } + + public File absolutePath() + { + return directory().getAbsoluteFile(); + } + + public File directory() + { + if ( testDirectory == null ) + { + throw new IllegalStateException( "Not initialized" ); + } + return testDirectory; + } + + public File directory( String name ) + { + File dir = new File( directory(), name ); + if ( !fileSystem.fileExists( dir ) ) + { + fileSystem.mkdir( dir ); + } + return dir; + } + + public File file( String name ) + { + return new File( ensureBase(), name ); + } + + public File graphDbDir() + { + return directory( "graph-db" ); + } + + public File makeGraphDbDir() + { + return cleanDirectory( "graph-db" ); + } + + public void cleanup() throws IOException + { + fileSystem.deleteRecursively( testClassBaseFolder ); + fileSystem.mkdirs( testClassBaseFolder ); + } + + @Override + public String toString() + { + String testDirectoryName = testDirectory == null ? "" : testDirectory.toString(); + return format( "%s[%s]", getClass().getSimpleName(), testDirectoryName ); + } + + public File cleanDirectory( String name ) + { + File dir = new File( ensureBase(), name ); + if ( fileSystem.fileExists( dir ) ) + { + deleteSilently( dir ); + } + fileSystem.mkdir( dir ); + return dir; + } + + private void complete( boolean success ) + { + if ( success && testDirectory != null && !keepDirectoryAfterSuccessfulTest ) + { + try + { + fileSystem.deleteRecursively( testDirectory ); + } + catch ( MaybeWindowsMemoryMappedFileReleaseProblem fme ) + { + System.err + .println( "Failed to delete test directory, maybe due to Windows memory-mapped file problem" ); + } + catch ( IOException e ) + { + throw new RuntimeException( e ); + } + } + testDirectory = null; + } + + private void deleteSilently( File dir ) + { + try + { + fileSystem.deleteRecursively( dir ); + } + catch ( IOException e ) + { + throw new RuntimeException( e ); + } + } + + private File directoryForDescription( Description description ) + { + if ( owningTest == null ) + { + owningTest = description.getTestClass(); + } + evaluateClassBaseTestFolder(); + String test = description.getMethodName(); + if ( test == null ) + { + test = "static"; + } + String dir = Digests.md5Hex( test ); + register( test, dir ); + return cleanDirectory( dir ); + } + + private void evaluateClassBaseTestFolder( ) + { + if (owningTest == null) + { + throw new IllegalStateException(" Test owning class is not defined" ); + } + File testData = new File( locateTarget( owningTest ), "test-data" ); + testClassBaseFolder = new File( testData, owningTest.getName() ).getAbsoluteFile(); + } + + private void register( String test, String dir ) + { + try + { + FileUtils.writeToFile( new File( ensureBase(), ".register" ), format( "%s=%s\n", dir, test ), true ); + } + catch ( IOException e ) + { + throw new RuntimeException( e ); + } + } + + private File ensureBase() + { + if ( testClassBaseFolder == null ) + { + evaluateClassBaseTestFolder(); + } + if ( fileSystem.fileExists( testClassBaseFolder ) && !fileSystem.isDirectory( testClassBaseFolder ) ) + { + throw new IllegalStateException( testClassBaseFolder + " exists and is not a directory!" ); + } + + try + { + fileSystem.mkdirs( testClassBaseFolder ); + } + catch ( IOException e ) + { + throw new RuntimeException( e ); + } + return testClassBaseFolder; + } + + private static File locateTarget( Class owningTest ) + { + try + { + File codeSource = new File( owningTest.getProtectionDomain().getCodeSource().getLocation().toURI() ); + if ( codeSource.isDirectory() ) + { + // code loaded from a directory + return codeSource.getParentFile(); + } + } + catch ( URISyntaxException e ) + { + // ignored + } + return new File( "target" ); + } +} diff --git a/community/kernel/src/main/java/org/neo4j/graphdb/factory/GraphDatabaseFactoryState.java b/community/kernel/src/main/java/org/neo4j/graphdb/factory/GraphDatabaseFactoryState.java index ca3707892c741..aa51df504398c 100644 --- a/community/kernel/src/main/java/org/neo4j/graphdb/factory/GraphDatabaseFactoryState.java +++ b/community/kernel/src/main/java/org/neo4j/graphdb/factory/GraphDatabaseFactoryState.java @@ -24,12 +24,12 @@ import java.util.List; import java.util.Map; +import org.neo4j.graphdb.security.URLAccessRule; import org.neo4j.helpers.Service; import org.neo4j.kernel.extension.KernelExtensionFactory; import org.neo4j.kernel.impl.factory.GraphDatabaseFacadeFactory; -import org.neo4j.graphdb.security.URLAccessRule; -import org.neo4j.logging.LogProvider; import org.neo4j.kernel.monitoring.Monitors; +import org.neo4j.logging.LogProvider; import static org.neo4j.kernel.GraphDatabaseDependencies.newDependencies; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/DatabaseAvailability.java b/community/kernel/src/main/java/org/neo4j/kernel/DatabaseAvailability.java index 59632ec559078..aba21df2ec656 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/DatabaseAvailability.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/DatabaseAvailability.java @@ -24,7 +24,6 @@ import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.locks.LockSupport.parkNanos; - import static org.neo4j.helpers.Clock.SYSTEM_CLOCK; import static org.neo4j.kernel.AvailabilityGuard.AvailabilityRequirement; import static org.neo4j.kernel.AvailabilityGuard.availabilityRequirement; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/GraphDatabaseQueryService.java b/community/kernel/src/main/java/org/neo4j/kernel/GraphDatabaseQueryService.java index f5b443da1995d..12fa997802ab3 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/GraphDatabaseQueryService.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/GraphDatabaseQueryService.java @@ -26,8 +26,8 @@ import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Relationship; import org.neo4j.graphdb.security.URLAccessValidationError; -import org.neo4j.kernel.api.security.AccessMode; import org.neo4j.kernel.api.KernelTransaction; +import org.neo4j.kernel.api.security.AccessMode; import org.neo4j.kernel.impl.coreapi.InternalTransaction; /* diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/cursor/EntityItemHelper.java b/community/kernel/src/main/java/org/neo4j/kernel/api/cursor/EntityItemHelper.java index 7359d7f39a525..9da33e529b9d1 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/cursor/EntityItemHelper.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/cursor/EntityItemHelper.java @@ -20,7 +20,6 @@ package org.neo4j.kernel.api.cursor; import org.neo4j.collection.primitive.PrimitiveIntCollection; -import org.neo4j.collection.primitive.PrimitiveIntIterator; import org.neo4j.collection.primitive.PrimitiveIntStack; import org.neo4j.cursor.Cursor; import org.neo4j.graphdb.NotFoundException; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/Kernel.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/Kernel.java index 6e7de2fc1100d..e8dd672655785 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/Kernel.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/Kernel.java @@ -19,13 +19,13 @@ */ package org.neo4j.kernel.impl.api; -import org.neo4j.kernel.api.security.AccessMode; import org.neo4j.kernel.api.KernelAPI; import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.kernel.api.TransactionHook; import org.neo4j.kernel.api.exceptions.ProcedureException; import org.neo4j.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.proc.CallableProcedure; +import org.neo4j.kernel.api.security.AccessMode; import org.neo4j.kernel.impl.proc.Procedures; import org.neo4j.kernel.impl.transaction.TransactionMonitor; import org.neo4j.kernel.internal.DatabaseHealth; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/dbms/NonTransactionalDbmsOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/dbms/NonTransactionalDbmsOperations.java index bca98c1f8038a..9f0e2789ff8b8 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/dbms/NonTransactionalDbmsOperations.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/dbms/NonTransactionalDbmsOperations.java @@ -25,7 +25,6 @@ import org.neo4j.kernel.api.exceptions.ProcedureException; import org.neo4j.kernel.api.proc.CallableProcedure; import org.neo4j.kernel.api.proc.ProcedureSignature; -import org.neo4j.kernel.api.security.AccessMode; import org.neo4j.kernel.api.security.AuthSubject; import org.neo4j.kernel.impl.proc.Procedures; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/ConstraintIndexCreator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/ConstraintIndexCreator.java index 5fd456cb887b0..718e13e2dc1e1 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/ConstraintIndexCreator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/ConstraintIndexCreator.java @@ -21,7 +21,6 @@ import java.util.function.Supplier; -import org.neo4j.kernel.api.security.AccessMode; import org.neo4j.kernel.api.KernelAPI; import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.kernel.api.Statement; @@ -36,12 +35,12 @@ import org.neo4j.kernel.api.exceptions.schema.SchemaRuleNotFoundException; import org.neo4j.kernel.api.exceptions.schema.UniquenessConstraintVerificationFailedKernelException; import org.neo4j.kernel.api.index.IndexDescriptor; +import org.neo4j.kernel.api.security.AccessMode; import org.neo4j.kernel.impl.api.KernelStatement; import org.neo4j.kernel.impl.api.index.IndexingService; import org.neo4j.kernel.impl.api.operations.SchemaReadOperations; import static java.util.Collections.singleton; - import static org.neo4j.kernel.impl.store.SchemaStorage.IndexRuleKind.CONSTRAINT; public class ConstraintIndexCreator diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/PropertyChanges.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/PropertyChanges.java index aab1c4ff8fe2f..959c0f29296d8 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/PropertyChanges.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/PropertyChanges.java @@ -21,9 +21,9 @@ import java.util.Map; +import org.neo4j.kernel.impl.util.VersionedHashMap; import org.neo4j.kernel.impl.util.diffsets.DiffSets; import org.neo4j.storageengine.api.txstate.ReadableDiffSets; -import org.neo4j.kernel.impl.util.VersionedHashMap; /** * Indexes entities by what property and value has been modified on them. diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/RelationshipIterator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/RelationshipIterator.java index 514b14f6fc15e..d5acb99a1eae7 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/RelationshipIterator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/RelationshipIterator.java @@ -21,8 +21,8 @@ import org.neo4j.collection.primitive.PrimitiveLongCollections; import org.neo4j.collection.primitive.PrimitiveLongCollections.PrimitiveLongBaseIterator; -import org.neo4j.kernel.impl.api.RelationshipVisitor; import org.neo4j.collection.primitive.PrimitiveLongIterator; +import org.neo4j.kernel.impl.api.RelationshipVisitor; public interface RelationshipIterator extends PrimitiveLongIterator, RelationshipVisitor.Home { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/DefaultLabelIdCreator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/DefaultLabelIdCreator.java index 00ec98b492b71..4f4b3a164b456 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/DefaultLabelIdCreator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/DefaultLabelIdCreator.java @@ -21,12 +21,12 @@ import java.util.function.Supplier; -import org.neo4j.kernel.impl.store.id.IdGeneratorFactory; -import org.neo4j.kernel.impl.store.id.IdType; import org.neo4j.kernel.api.KernelAPI; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.exceptions.schema.IllegalTokenNameException; import org.neo4j.kernel.api.exceptions.schema.TooManyLabelsException; +import org.neo4j.kernel.impl.store.id.IdGeneratorFactory; +import org.neo4j.kernel.impl.store.id.IdType; public class DefaultLabelIdCreator extends IsolatedTransactionTokenCreator { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/DefaultPropertyTokenCreator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/DefaultPropertyTokenCreator.java index 92d6ba1c416b1..6ea6e93297023 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/DefaultPropertyTokenCreator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/DefaultPropertyTokenCreator.java @@ -21,11 +21,11 @@ import java.util.function.Supplier; -import org.neo4j.kernel.impl.store.id.IdGeneratorFactory; -import org.neo4j.kernel.impl.store.id.IdType; import org.neo4j.kernel.api.KernelAPI; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.exceptions.schema.IllegalTokenNameException; +import org.neo4j.kernel.impl.store.id.IdGeneratorFactory; +import org.neo4j.kernel.impl.store.id.IdType; public class DefaultPropertyTokenCreator extends IsolatedTransactionTokenCreator { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/DefaultRelationshipTypeCreator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/DefaultRelationshipTypeCreator.java index 3b028aafeb7bf..21c8f5b0db8a4 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/DefaultRelationshipTypeCreator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/DefaultRelationshipTypeCreator.java @@ -21,11 +21,11 @@ import java.util.function.Supplier; -import org.neo4j.kernel.impl.store.id.IdGeneratorFactory; -import org.neo4j.kernel.impl.store.id.IdType; import org.neo4j.kernel.api.KernelAPI; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.exceptions.schema.IllegalTokenNameException; +import org.neo4j.kernel.impl.store.id.IdGeneratorFactory; +import org.neo4j.kernel.impl.store.id.IdType; public class DefaultRelationshipTypeCreator extends IsolatedTransactionTokenCreator { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/IsolatedTransactionTokenCreator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/IsolatedTransactionTokenCreator.java index b43f6ac02959b..d2d7b8c0baad5 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/IsolatedTransactionTokenCreator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/IsolatedTransactionTokenCreator.java @@ -21,14 +21,14 @@ import java.util.function.Supplier; -import org.neo4j.kernel.api.security.AccessMode; -import org.neo4j.kernel.api.KernelTransaction.Type; -import org.neo4j.kernel.impl.store.id.IdGeneratorFactory; import org.neo4j.kernel.api.KernelAPI; import org.neo4j.kernel.api.KernelTransaction; +import org.neo4j.kernel.api.KernelTransaction.Type; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.exceptions.schema.IllegalTokenNameException; import org.neo4j.kernel.api.exceptions.schema.TooManyLabelsException; +import org.neo4j.kernel.api.security.AccessMode; +import org.neo4j.kernel.impl.store.id.IdGeneratorFactory; /** * Creates a key within its own transaction, such that the command(s) for creating the key diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/InternalTransaction.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/InternalTransaction.java index 5135ab5eedb78..cc7f401126020 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/InternalTransaction.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/InternalTransaction.java @@ -20,8 +20,8 @@ package org.neo4j.kernel.impl.coreapi; import org.neo4j.graphdb.Transaction; -import org.neo4j.kernel.api.security.AccessMode; import org.neo4j.kernel.api.KernelTransaction; +import org.neo4j.kernel.api.security.AccessMode; public interface InternalTransaction extends Transaction { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/ClassicCoreSPI.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/ClassicCoreSPI.java index 0007a6c756dec..e256b5dc06e80 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/ClassicCoreSPI.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/ClassicCoreSPI.java @@ -30,11 +30,11 @@ import org.neo4j.graphdb.event.TransactionEventHandler; import org.neo4j.graphdb.security.URLAccessValidationError; import org.neo4j.kernel.GraphDatabaseQueryService; -import org.neo4j.kernel.api.security.AccessMode; import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.legacyindex.AutoIndexing; +import org.neo4j.kernel.api.security.AccessMode; import org.neo4j.kernel.impl.coreapi.CoreAPIAvailabilityGuard; import org.neo4j.kernel.impl.query.QueryExecutionKernelException; import org.neo4j.kernel.impl.query.QuerySession; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/StatementLocksFactorySelector.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/StatementLocksFactorySelector.java index 98f7a3f9b338d..a7ffe72cd990d 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/StatementLocksFactorySelector.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/StatementLocksFactorySelector.java @@ -23,7 +23,6 @@ import org.neo4j.helpers.Service; import org.neo4j.helpers.collection.Iterables; -import org.neo4j.helpers.collection.Iterators; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.locking.Locks; import org.neo4j.kernel.impl.locking.SimpleStatementLocksFactory; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/IndexCommand.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/IndexCommand.java index 7a40a2b65c550..3c5e41f73ce84 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/IndexCommand.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/IndexCommand.java @@ -30,7 +30,6 @@ import org.neo4j.storageengine.api.WritableChannel; import static java.lang.String.format; - import static org.neo4j.kernel.impl.util.IoPrimitiveUtils.write2bLengthAndString; import static org.neo4j.kernel.impl.util.IoPrimitiveUtils.write3bLengthAndString; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/locking/community/RWLock.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/locking/community/RWLock.java index 7bbf9187c0698..2746b6f88aa3f 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/locking/community/RWLock.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/locking/community/RWLock.java @@ -31,7 +31,6 @@ import static java.lang.Thread.currentThread; import static java.lang.Thread.interrupted; - import static org.neo4j.kernel.impl.locking.LockType.READ; import static org.neo4j.kernel.impl.locking.LockType.WRITE; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/pagecache/ConfiguringPageCacheFactory.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/pagecache/ConfiguringPageCacheFactory.java index 273921fa3f30b..662311a0c2668 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/pagecache/ConfiguringPageCacheFactory.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/pagecache/ConfiguringPageCacheFactory.java @@ -19,7 +19,6 @@ */ package org.neo4j.kernel.impl.pagecache; -import org.neo4j.kernel.impl.util.OsBeanUtil; import org.neo4j.helpers.Service; import org.neo4j.io.ByteUnit; import org.neo4j.io.fs.FileSystemAbstraction; @@ -29,6 +28,7 @@ import org.neo4j.io.pagecache.impl.muninn.MuninnPageCache; import org.neo4j.io.pagecache.tracing.PageCacheTracer; import org.neo4j.kernel.configuration.Config; +import org.neo4j.kernel.impl.util.OsBeanUtil; import org.neo4j.logging.Log; import static org.neo4j.graphdb.factory.GraphDatabaseSettings.mapped_memory_page_size; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/query/Neo4jTransactionalContext.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/query/Neo4jTransactionalContext.java index 8e4582faacbdb..131e6a069e470 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/query/Neo4jTransactionalContext.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/query/Neo4jTransactionalContext.java @@ -22,10 +22,10 @@ import org.neo4j.graphdb.Lock; import org.neo4j.graphdb.PropertyContainer; import org.neo4j.kernel.GraphDatabaseQueryService; -import org.neo4j.kernel.api.dbms.DbmsOperations; import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.kernel.api.ReadOperations; import org.neo4j.kernel.api.Statement; +import org.neo4j.kernel.api.dbms.DbmsOperations; import org.neo4j.kernel.api.security.AccessMode; import org.neo4j.kernel.api.txstate.TxStateHolder; import org.neo4j.kernel.impl.api.KernelStatement; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/query/TransactionalContext.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/query/TransactionalContext.java index 32ab87513ac43..544d29b6995e1 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/query/TransactionalContext.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/query/TransactionalContext.java @@ -22,10 +22,10 @@ import org.neo4j.graphdb.Lock; import org.neo4j.graphdb.PropertyContainer; import org.neo4j.kernel.GraphDatabaseQueryService; -import org.neo4j.kernel.api.dbms.DbmsOperations; import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.kernel.api.ReadOperations; import org.neo4j.kernel.api.Statement; +import org.neo4j.kernel.api.dbms.DbmsOperations; import org.neo4j.kernel.api.security.AccessMode; import org.neo4j.kernel.api.txstate.TxStateHolder; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/CommonAbstractStore.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/CommonAbstractStore.java index 9ebe7b1142ad2..d8f275a67e582 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/CommonAbstractStore.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/CommonAbstractStore.java @@ -47,7 +47,6 @@ import org.neo4j.string.UTF8; import static java.nio.file.StandardOpenOption.DELETE_ON_CLOSE; - import static org.neo4j.helpers.ArrayUtil.contains; import static org.neo4j.helpers.Exceptions.launderedException; import static org.neo4j.io.pagecache.PageCacheOpenOptions.ANY_PAGE_SIZE; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/DynamicArrayStore.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/DynamicArrayStore.java index 0de8195feb28f..c4da034bfadbb 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/DynamicArrayStore.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/DynamicArrayStore.java @@ -27,10 +27,10 @@ import org.neo4j.helpers.collection.Pair; import org.neo4j.io.pagecache.PageCache; -import org.neo4j.kernel.impl.store.id.IdGeneratorFactory; -import org.neo4j.kernel.impl.store.id.IdType; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.store.format.RecordFormat; +import org.neo4j.kernel.impl.store.id.IdGeneratorFactory; +import org.neo4j.kernel.impl.store.id.IdType; import org.neo4j.kernel.impl.store.record.DynamicRecord; import org.neo4j.kernel.impl.util.Bits; import org.neo4j.logging.LogProvider; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/DynamicStringStore.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/DynamicStringStore.java index fc7544973600e..0a2909d315501 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/DynamicStringStore.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/DynamicStringStore.java @@ -23,10 +23,10 @@ import java.nio.file.OpenOption; import org.neo4j.io.pagecache.PageCache; -import org.neo4j.kernel.impl.store.id.IdGeneratorFactory; -import org.neo4j.kernel.impl.store.id.IdType; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.store.format.RecordFormat; +import org.neo4j.kernel.impl.store.id.IdGeneratorFactory; +import org.neo4j.kernel.impl.store.id.IdType; import org.neo4j.kernel.impl.store.record.DynamicRecord; import org.neo4j.logging.LogProvider; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/RecordStore.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/RecordStore.java index b66c9e39aa0a6..622e8d7b89075 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/RecordStore.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/RecordStore.java @@ -23,13 +23,13 @@ import java.util.Collection; import java.util.function.Predicate; -import org.neo4j.helpers.collection.Visitor; -import org.neo4j.helpers.progress.ProgressListener; import org.neo4j.graphdb.ResourceIterable; import org.neo4j.graphdb.ResourceIterator; -import org.neo4j.kernel.impl.store.id.IdType; +import org.neo4j.helpers.collection.Visitor; +import org.neo4j.helpers.progress.ProgressListener; import org.neo4j.io.pagecache.PageCursor; import org.neo4j.kernel.impl.store.id.IdSequence; +import org.neo4j.kernel.impl.store.id.IdType; import org.neo4j.kernel.impl.store.record.AbstractBaseRecord; import org.neo4j.kernel.impl.store.record.DynamicRecord; import org.neo4j.kernel.impl.store.record.LabelTokenRecord; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/StoreType.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/StoreType.java index 1ac6951958ea6..fde9813fdbb8b 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/StoreType.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/StoreType.java @@ -22,9 +22,9 @@ import java.io.IOException; import org.neo4j.graphdb.factory.GraphDatabaseSettings; +import org.neo4j.kernel.impl.store.counts.CountsTracker; import org.neo4j.kernel.impl.store.id.IdType; import org.neo4j.kernel.impl.storemigration.StoreFile; -import org.neo4j.kernel.impl.store.counts.CountsTracker; public enum StoreType { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/counts/CountsTracker.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/counts/CountsTracker.java index 3439289871c62..eb89f977796dd 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/counts/CountsTracker.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/counts/CountsTracker.java @@ -49,7 +49,6 @@ import org.neo4j.register.Register; import static java.lang.String.format; - import static org.neo4j.kernel.impl.store.counts.keys.CountsKeyFactory.indexSampleKey; import static org.neo4j.kernel.impl.store.counts.keys.CountsKeyFactory.indexStatisticsKey; import static org.neo4j.kernel.impl.store.counts.keys.CountsKeyFactory.nodeKey; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/kvstore/WritableState.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/kvstore/WritableState.java index 13b1f21dbf03b..919d53aba8722 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/kvstore/WritableState.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/kvstore/WritableState.java @@ -19,9 +19,8 @@ */ package org.neo4j.kernel.impl.store.kvstore; -import java.util.concurrent.locks.Lock; - import java.util.Optional; +import java.util.concurrent.locks.Lock; abstract class WritableState extends ReadableState { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/LoggingLogFileMonitor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/LoggingLogFileMonitor.java index c841f9259c94e..1498d2ff154a0 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/LoggingLogFileMonitor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/LoggingLogFileMonitor.java @@ -21,9 +21,9 @@ import java.io.File; -import org.neo4j.kernel.recovery.Recovery; import org.neo4j.kernel.impl.transaction.log.rotation.LogRotation; import org.neo4j.kernel.impl.transaction.state.RecoveryVisitor; +import org.neo4j.kernel.recovery.Recovery; import org.neo4j.logging.Log; import static java.lang.String.format; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/PhysicalLogFiles.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/PhysicalLogFiles.java index 4f2e2713fe4cb..81de00c4d16d7 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/PhysicalLogFiles.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/PhysicalLogFiles.java @@ -28,7 +28,6 @@ import static java.lang.Math.max; import static java.lang.Math.min; - import static org.neo4j.kernel.impl.transaction.log.PhysicalLogFile.DEFAULT_VERSION_SUFFIX; import static org.neo4j.kernel.impl.transaction.log.PhysicalLogFile.REGEX_DEFAULT_VERSION_SUFFIX; import static org.neo4j.kernel.impl.transaction.log.entry.LogHeader.LOG_HEADER_SIZE; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/ReadableClosableChannel.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/ReadableClosableChannel.java index 81380e6d508a7..03b61006a4f79 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/ReadableClosableChannel.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/ReadableClosableChannel.java @@ -20,6 +20,7 @@ package org.neo4j.kernel.impl.transaction.log; import java.io.Closeable; + import org.neo4j.storageengine.api.ReadableChannel; public interface ReadableClosableChannel extends ReadableChannel, Closeable diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/TransactionMetadataCache.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/TransactionMetadataCache.java index 2792dd7d08f28..4b086e9c52c17 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/TransactionMetadataCache.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/TransactionMetadataCache.java @@ -19,9 +19,10 @@ */ package org.neo4j.kernel.impl.transaction.log; -import org.neo4j.helpers.collection.LruCache; import java.util.Objects; +import org.neo4j.helpers.collection.LruCache; + public class TransactionMetadataCache { private final LruCache txStartPositionCache; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/checkpoint/CheckPointerImpl.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/checkpoint/CheckPointerImpl.java index 13042cb3cac1c..c80c8b689fc6b 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/checkpoint/CheckPointerImpl.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/checkpoint/CheckPointerImpl.java @@ -24,13 +24,13 @@ import java.util.concurrent.locks.ReentrantLock; import org.neo4j.io.pagecache.IOLimiter; -import org.neo4j.kernel.internal.DatabaseHealth; import org.neo4j.kernel.impl.transaction.log.LogPosition; import org.neo4j.kernel.impl.transaction.log.TransactionAppender; import org.neo4j.kernel.impl.transaction.log.TransactionIdStore; import org.neo4j.kernel.impl.transaction.log.pruning.LogPruning; import org.neo4j.kernel.impl.transaction.tracing.CheckPointTracer; import org.neo4j.kernel.impl.transaction.tracing.LogCheckPointEvent; +import org.neo4j.kernel.internal.DatabaseHealth; import org.neo4j.kernel.lifecycle.LifecycleAdapter; import org.neo4j.logging.Log; import org.neo4j.logging.LogProvider; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/rotation/LogRotationImpl.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/rotation/LogRotationImpl.java index 96d0b552cda04..cd58e67e492e9 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/rotation/LogRotationImpl.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/log/rotation/LogRotationImpl.java @@ -21,10 +21,10 @@ import java.io.IOException; -import org.neo4j.kernel.internal.DatabaseHealth; import org.neo4j.kernel.impl.transaction.log.LogFile; import org.neo4j.kernel.impl.transaction.tracing.LogAppendEvent; import org.neo4j.kernel.impl.transaction.tracing.LogRotateEvent; +import org.neo4j.kernel.internal.DatabaseHealth; /** * Default implementation of the LogRotation interface. diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/IntegrityValidator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/IntegrityValidator.java index 6137e5e1266b2..9ccf0750e066b 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/IntegrityValidator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/IntegrityValidator.java @@ -27,10 +27,10 @@ import org.neo4j.kernel.api.exceptions.schema.ConstraintVerificationFailedKernelException; import org.neo4j.kernel.impl.api.index.IndexingService; import org.neo4j.kernel.impl.store.NeoStores; -import org.neo4j.kernel.impl.store.record.UniquePropertyConstraintRule; -import org.neo4j.storageengine.api.schema.SchemaRule; import org.neo4j.kernel.impl.store.record.NodeRecord; import org.neo4j.kernel.impl.store.record.Record; +import org.neo4j.kernel.impl.store.record.UniquePropertyConstraintRule; +import org.neo4j.storageengine.api.schema.SchemaRule; /** * Validates data integrity during the prepare phase of {@link TransactionRecordState}. diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/LabelChangeSummary.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/LabelChangeSummary.java index 56b908608bd45..6b60e97c7d4a2 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/LabelChangeSummary.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/LabelChangeSummary.java @@ -21,7 +21,6 @@ import static java.util.Arrays.binarySearch; import static java.util.Arrays.copyOf; - import static org.neo4j.collection.primitive.PrimitiveLongCollections.EMPTY_LONG_ARRAY; public class LabelChangeSummary diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/dbstructure/GraphDbStructureGuide.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/dbstructure/GraphDbStructureGuide.java index 2207581902000..b2400b14c7e07 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/dbstructure/GraphDbStructureGuide.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/dbstructure/GraphDbStructureGuide.java @@ -27,7 +27,6 @@ import org.neo4j.graphdb.RelationshipType; import org.neo4j.graphdb.Transaction; import org.neo4j.helpers.collection.Visitable; -import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.api.ReadOperations; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.StatementTokenNameLookup; @@ -40,6 +39,7 @@ import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; import org.neo4j.kernel.api.index.IndexDescriptor; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import static java.lang.String.format; import static org.neo4j.kernel.api.ReadOperations.ANY_LABEL; diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/BatchInsertRelationshipsStep.java b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/BatchInsertRelationshipsStep.java index 67f01c1798a35..8e63953157737 100644 --- a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/BatchInsertRelationshipsStep.java +++ b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/BatchInsertRelationshipsStep.java @@ -34,9 +34,9 @@ import org.neo4j.kernel.impl.transaction.state.RelationshipCreator; import org.neo4j.kernel.impl.transaction.state.RelationshipGroupGetter; import org.neo4j.kernel.impl.util.ReusableIteratorCostume; +import org.neo4j.unsafe.batchinsert.DirectRecordAccessSet; import org.neo4j.unsafe.impl.batchimport.input.InputRelationship; import org.neo4j.unsafe.impl.batchimport.staging.BatchSender; -import org.neo4j.unsafe.batchinsert.DirectRecordAccessSet; import org.neo4j.unsafe.impl.batchimport.staging.ProcessorStep; import org.neo4j.unsafe.impl.batchimport.staging.StageControl; import org.neo4j.unsafe.impl.batchimport.store.BatchingIdSequence; diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/RelationshipPreparationStep.java b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/RelationshipPreparationStep.java index ced74f74a0ee2..500a3bebc8d86 100644 --- a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/RelationshipPreparationStep.java +++ b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/RelationshipPreparationStep.java @@ -20,6 +20,7 @@ package org.neo4j.unsafe.impl.batchimport; import java.util.Arrays; + import org.neo4j.kernel.impl.store.record.RelationshipRecord; import org.neo4j.unsafe.impl.batchimport.cache.idmapping.IdMapper; import org.neo4j.unsafe.impl.batchimport.input.InputRelationship; diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/cache/NodeLabelsCache.java b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/cache/NodeLabelsCache.java index 049bb6750b1e9..d41e0cab2fdba 100644 --- a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/cache/NodeLabelsCache.java +++ b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/cache/NodeLabelsCache.java @@ -23,7 +23,6 @@ import static java.lang.Integer.numberOfLeadingZeros; import static java.lang.Math.max; - import static org.neo4j.kernel.impl.util.Bits.bitsFromLongs; /** diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/cache/NodeRelationshipCache.java b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/cache/NodeRelationshipCache.java index 336aaf1e88389..03a9417bcf14b 100644 --- a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/cache/NodeRelationshipCache.java +++ b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/cache/NodeRelationshipCache.java @@ -21,6 +21,7 @@ import java.util.Arrays; import java.util.concurrent.atomic.AtomicLong; + import org.neo4j.graphdb.Direction; import static java.lang.Math.toIntExact; diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/cache/NumberArrayFactory.java b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/cache/NumberArrayFactory.java index a2cd43aa07891..7d108588af21d 100644 --- a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/cache/NumberArrayFactory.java +++ b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/cache/NumberArrayFactory.java @@ -25,7 +25,6 @@ import static java.lang.Math.toIntExact; import static java.lang.String.format; - import static org.neo4j.helpers.Format.bytes; import static org.neo4j.unsafe.impl.batchimport.Utils.safeCastLongToInt; diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/cache/idmapping/string/EncodingIdMapper.java b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/cache/idmapping/string/EncodingIdMapper.java index 8e2ceb588b483..adcbec413992d 100644 --- a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/cache/idmapping/string/EncodingIdMapper.java +++ b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/cache/idmapping/string/EncodingIdMapper.java @@ -44,7 +44,6 @@ import static java.lang.Math.max; import static java.lang.Math.min; import static java.lang.String.format; - import static org.neo4j.unsafe.impl.batchimport.Utils.safeCastLongToInt; import static org.neo4j.unsafe.impl.batchimport.Utils.unsignedCompare; import static org.neo4j.unsafe.impl.batchimport.Utils.unsignedDifference; diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/executor/DynamicTaskExecutor.java b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/executor/DynamicTaskExecutor.java index 769c474609c9a..8f1802d8e6e1a 100644 --- a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/executor/DynamicTaskExecutor.java +++ b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/executor/DynamicTaskExecutor.java @@ -31,7 +31,6 @@ import static java.lang.Integer.max; import static java.lang.Integer.min; import static java.util.concurrent.TimeUnit.MILLISECONDS; - import static org.neo4j.helpers.Exceptions.launderedException; /** diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/input/BadCollector.java b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/input/BadCollector.java index 96ede2e1fa78e..56c0e5273bf94 100644 --- a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/input/BadCollector.java +++ b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/input/BadCollector.java @@ -30,7 +30,6 @@ import static java.lang.String.format; import static java.util.Arrays.copyOf; import static java.util.Arrays.sort; - import static org.neo4j.helpers.Exceptions.withMessage; public class BadCollector implements Collector diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/input/InputRelationshipReader.java b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/input/InputRelationshipReader.java index 7246e5cffff72..d98f73c8913f5 100644 --- a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/input/InputRelationshipReader.java +++ b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/input/InputRelationshipReader.java @@ -24,10 +24,10 @@ import org.neo4j.io.fs.StoreChannel; import org.neo4j.kernel.impl.transaction.log.ReadableClosablePositionAwareChannel; +import static org.neo4j.unsafe.impl.batchimport.input.InputCache.HAS_TYPE_ID; import static org.neo4j.unsafe.impl.batchimport.input.InputCache.NEW_TYPE; import static org.neo4j.unsafe.impl.batchimport.input.InputCache.RELATIONSHIP_TYPE_TOKEN; import static org.neo4j.unsafe.impl.batchimport.input.InputCache.SAME_TYPE; -import static org.neo4j.unsafe.impl.batchimport.input.InputCache.HAS_TYPE_ID; import static org.neo4j.unsafe.impl.batchimport.input.InputEntity.NO_PROPERTIES; /** diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/input/Inputs.java b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/input/Inputs.java index 06685802db83f..2e716f0e39ae5 100644 --- a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/input/Inputs.java +++ b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/input/Inputs.java @@ -29,7 +29,6 @@ import org.neo4j.unsafe.impl.batchimport.input.csv.IdType; import static java.nio.charset.Charset.defaultCharset; - import static org.neo4j.unsafe.impl.batchimport.input.InputEntityDecorators.NO_NODE_DECORATOR; import static org.neo4j.unsafe.impl.batchimport.input.InputEntityDecorators.NO_RELATIONSHIP_DECORATOR; import static org.neo4j.unsafe.impl.batchimport.input.csv.DataFactories.data; diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/staging/DetailedExecutionMonitor.java b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/staging/DetailedExecutionMonitor.java index 489d70b608266..5f938bd0d75a6 100644 --- a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/staging/DetailedExecutionMonitor.java +++ b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/staging/DetailedExecutionMonitor.java @@ -27,7 +27,6 @@ import static java.lang.String.format; import static java.util.concurrent.TimeUnit.SECONDS; - import static org.neo4j.helpers.Format.duration; /** diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/staging/ExecutionMonitors.java b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/staging/ExecutionMonitors.java index 0546ea0c1926e..0eb4b015b3efe 100644 --- a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/staging/ExecutionMonitors.java +++ b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/staging/ExecutionMonitors.java @@ -20,7 +20,6 @@ package org.neo4j.unsafe.impl.batchimport.staging; import static java.util.concurrent.TimeUnit.SECONDS; - import static org.neo4j.unsafe.impl.batchimport.staging.SpectrumExecutionMonitor.DEFAULT_WIDTH; /** diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/staging/ProcessorStep.java b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/staging/ProcessorStep.java index 3c627323a6e8c..46c3f6acae7b3 100644 --- a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/staging/ProcessorStep.java +++ b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/staging/ProcessorStep.java @@ -31,7 +31,6 @@ import static java.lang.System.currentTimeMillis; import static java.lang.System.nanoTime; import static java.util.concurrent.TimeUnit.MILLISECONDS; - import static org.neo4j.unsafe.impl.batchimport.executor.DynamicTaskExecutor.DEFAULT_PARK_STRATEGY; import static org.neo4j.unsafe.impl.batchimport.executor.TaskExecutor.SF_ABORT_QUEUED; import static org.neo4j.unsafe.impl.batchimport.executor.TaskExecutor.SF_AWAIT_ALL_COMPLETED; diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/staging/ReadRecordsStep.java b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/staging/ReadRecordsStep.java index 7d817f849ded8..afcb836c782d1 100644 --- a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/staging/ReadRecordsStep.java +++ b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/staging/ReadRecordsStep.java @@ -21,11 +21,13 @@ import java.lang.reflect.Array; import java.util.Arrays; + import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.kernel.impl.store.RecordCursor; import org.neo4j.kernel.impl.store.RecordStore; import org.neo4j.kernel.impl.store.id.validation.IdValidator; import org.neo4j.kernel.impl.store.record.AbstractBaseRecord; + import static org.neo4j.kernel.impl.store.record.RecordLoad.CHECK; /** diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/staging/StageExecution.java b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/staging/StageExecution.java index a484518f1baa8..8fdbb655e2930 100644 --- a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/staging/StageExecution.java +++ b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/staging/StageExecution.java @@ -32,7 +32,6 @@ import org.neo4j.unsafe.impl.batchimport.stats.Stat; import static java.lang.System.currentTimeMillis; - import static org.neo4j.helpers.Exceptions.launderedException; /** diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/staging/TicketedProcessing.java b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/staging/TicketedProcessing.java index 1a26522e27a70..c207f90ce632f 100644 --- a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/staging/TicketedProcessing.java +++ b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/staging/TicketedProcessing.java @@ -33,7 +33,6 @@ import org.neo4j.unsafe.impl.batchimport.executor.TaskExecutor; import static java.util.concurrent.TimeUnit.MILLISECONDS; - import static org.neo4j.helpers.FutureAdapter.future; import static org.neo4j.unsafe.impl.batchimport.staging.Processing.await; diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/store/BatchingNeoStores.java b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/store/BatchingNeoStores.java index 78fe886785dd1..0d6ca73d9d489 100644 --- a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/store/BatchingNeoStores.java +++ b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/store/BatchingNeoStores.java @@ -22,6 +22,7 @@ import java.io.File; import java.io.IOException; import java.nio.file.OpenOption; + import org.neo4j.graphdb.factory.GraphDatabaseSettings; import org.neo4j.helpers.Service; import org.neo4j.io.fs.FileSystemAbstraction; @@ -65,7 +66,6 @@ import static java.lang.String.valueOf; import static java.nio.file.StandardOpenOption.DELETE_ON_CLOSE; - import static org.neo4j.graphdb.factory.GraphDatabaseSettings.dense_node_threshold; import static org.neo4j.graphdb.factory.GraphDatabaseSettings.mapped_memory_page_size; import static org.neo4j.graphdb.factory.GraphDatabaseSettings.pagecache_memory; diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/FirstStartupIT.java b/community/kernel/src/test/java/org/neo4j/graphdb/FirstStartupIT.java index 0961405a25bc9..61b7f3cb776d3 100644 --- a/community/kernel/src/test/java/org/neo4j/graphdb/FirstStartupIT.java +++ b/community/kernel/src/test/java/org/neo4j/graphdb/FirstStartupIT.java @@ -25,7 +25,7 @@ import java.io.File; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertEquals; import static org.neo4j.helpers.collection.Iterables.count; @@ -33,7 +33,7 @@ public class FirstStartupIT { @Rule - public TargetDirectory.TestDirectory testDir = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory testDir = TestDirectory.testDirectory(); @Test public void shouldBeEmptyWhenFirstStarted() throws Exception diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/GraphDatabaseInternalLogIT.java b/community/kernel/src/test/java/org/neo4j/graphdb/GraphDatabaseInternalLogIT.java index f09189752410b..bae71fe4b34c6 100644 --- a/community/kernel/src/test/java/org/neo4j/graphdb/GraphDatabaseInternalLogIT.java +++ b/community/kernel/src/test/java/org/neo4j/graphdb/GraphDatabaseInternalLogIT.java @@ -33,7 +33,7 @@ import org.neo4j.kernel.impl.logging.StoreLogService; import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.greaterThan; @@ -43,7 +43,7 @@ public class GraphDatabaseInternalLogIT { @Rule - public TargetDirectory.TestDirectory testDir = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory testDir = TestDirectory.testDirectory(); @Test public void shouldWriteToInternalDiagnosticsLog() throws Exception diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/MandatoryTransactionsForIndexManagerFacadeTests.java b/community/kernel/src/test/java/org/neo4j/graphdb/MandatoryTransactionsForIndexManagerFacadeTests.java index 3a2002703e389..4e0ae4c092504 100644 --- a/community/kernel/src/test/java/org/neo4j/graphdb/MandatoryTransactionsForIndexManagerFacadeTests.java +++ b/community/kernel/src/test/java/org/neo4j/graphdb/MandatoryTransactionsForIndexManagerFacadeTests.java @@ -20,6 +20,7 @@ package org.neo4j.graphdb; import org.junit.Test; + import org.neo4j.graphdb.index.IndexManager; import static org.neo4j.graphdb.IndexManagerFacadeMethods.ALL_INDEX_MANAGER_FACADE_METHODS; diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/MandatoryTransactionsForRelationshipTests.java b/community/kernel/src/test/java/org/neo4j/graphdb/MandatoryTransactionsForRelationshipTests.java index a56799206b027..a233c5dafd99d 100644 --- a/community/kernel/src/test/java/org/neo4j/graphdb/MandatoryTransactionsForRelationshipTests.java +++ b/community/kernel/src/test/java/org/neo4j/graphdb/MandatoryTransactionsForRelationshipTests.java @@ -21,8 +21,8 @@ import org.junit.Test; -import static org.neo4j.graphdb.RelationshipType.withName; import static org.neo4j.graphdb.RelationshipFacadeMethods.ALL_RELATIONSHIP_FACADE_METHODS; +import static org.neo4j.graphdb.RelationshipType.withName; public class MandatoryTransactionsForRelationshipTests extends AbstractMandatoryTransactionsTest { diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/MandatoryTransactionsForUniquenessConstraintDefinitionTests.java b/community/kernel/src/test/java/org/neo4j/graphdb/MandatoryTransactionsForUniquenessConstraintDefinitionTests.java index c1cdda48f1566..8d6820fa4b644 100644 --- a/community/kernel/src/test/java/org/neo4j/graphdb/MandatoryTransactionsForUniquenessConstraintDefinitionTests.java +++ b/community/kernel/src/test/java/org/neo4j/graphdb/MandatoryTransactionsForUniquenessConstraintDefinitionTests.java @@ -20,6 +20,7 @@ package org.neo4j.graphdb; import org.junit.Test; + import org.neo4j.graphdb.schema.ConstraintDefinition; import static org.neo4j.graphdb.ConstraintDefinitionFacadeMethods.ALL_CONSTRAINT_DEFINITION_FACADE_METHODS; diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/NodeFacadeMethods.java b/community/kernel/src/test/java/org/neo4j/graphdb/NodeFacadeMethods.java index 4745a7fcf0d52..8f7413a978cfd 100644 --- a/community/kernel/src/test/java/org/neo4j/graphdb/NodeFacadeMethods.java +++ b/community/kernel/src/test/java/org/neo4j/graphdb/NodeFacadeMethods.java @@ -21,9 +21,7 @@ import static java.util.Arrays.asList; import static java.util.Collections.unmodifiableCollection; - import static org.junit.Assert.assertNotNull; - import static org.neo4j.graphdb.Direction.BOTH; import static org.neo4j.graphdb.Label.label; import static org.neo4j.graphdb.RelationshipType.withName; diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/QueryExecutionTypeTest.java b/community/kernel/src/test/java/org/neo4j/graphdb/QueryExecutionTypeTest.java index e5216afac8068..daecc00d725ff 100644 --- a/community/kernel/src/test/java/org/neo4j/graphdb/QueryExecutionTypeTest.java +++ b/community/kernel/src/test/java/org/neo4j/graphdb/QueryExecutionTypeTest.java @@ -29,8 +29,13 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static org.neo4j.graphdb.QueryExecutionType.QueryType.*; -import static org.neo4j.graphdb.QueryExecutionType.*; +import static org.neo4j.graphdb.QueryExecutionType.QueryType.READ_ONLY; +import static org.neo4j.graphdb.QueryExecutionType.QueryType.READ_WRITE; +import static org.neo4j.graphdb.QueryExecutionType.QueryType.SCHEMA_WRITE; +import static org.neo4j.graphdb.QueryExecutionType.QueryType.WRITE; +import static org.neo4j.graphdb.QueryExecutionType.explained; +import static org.neo4j.graphdb.QueryExecutionType.profiled; +import static org.neo4j.graphdb.QueryExecutionType.query; @RunWith(Parameterized.class) public class QueryExecutionTypeTest diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/RelationshipFacadeMethods.java b/community/kernel/src/test/java/org/neo4j/graphdb/RelationshipFacadeMethods.java index c05bef21e8cb6..1fe0c2ac59818 100644 --- a/community/kernel/src/test/java/org/neo4j/graphdb/RelationshipFacadeMethods.java +++ b/community/kernel/src/test/java/org/neo4j/graphdb/RelationshipFacadeMethods.java @@ -21,7 +21,6 @@ import static java.util.Arrays.asList; import static java.util.Collections.unmodifiableCollection; - import static org.neo4j.graphdb.RelationshipType.withName; @SuppressWarnings("UnusedDeclaration") diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/RunOutOfDiskSpaceIT.java b/community/kernel/src/test/java/org/neo4j/graphdb/RunOutOfDiskSpaceIT.java index d79063abce14b..191bada852cc5 100644 --- a/community/kernel/src/test/java/org/neo4j/graphdb/RunOutOfDiskSpaceIT.java +++ b/community/kernel/src/test/java/org/neo4j/graphdb/RunOutOfDiskSpaceIT.java @@ -33,7 +33,7 @@ import org.neo4j.test.LimitedFileSystemGraphDatabase; import org.neo4j.test.rule.CleanupRule; import org.neo4j.test.rule.PageCacheRule; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -149,7 +149,7 @@ public void shouldStopDatabaseWhenOutOfDiskSpace() throws Exception } @Rule - public final TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory testDirectory = TestDirectory.testDirectory(); @Rule public final PageCacheRule pageCacheRule = new PageCacheRule(); } diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/impl/notification/NotificationDetailTest.java b/community/kernel/src/test/java/org/neo4j/graphdb/impl/notification/NotificationDetailTest.java index 8e81860a4a851..d0dacb2f85030 100644 --- a/community/kernel/src/test/java/org/neo4j/graphdb/impl/notification/NotificationDetailTest.java +++ b/community/kernel/src/test/java/org/neo4j/graphdb/impl/notification/NotificationDetailTest.java @@ -21,7 +21,11 @@ import org.junit.Test; -import java.util.*; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.TreeSet; import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/index/UniqueFactoryTest.java b/community/kernel/src/test/java/org/neo4j/graphdb/index/UniqueFactoryTest.java index 3c5fcd3060d6b..4b5f5c4e9d974 100644 --- a/community/kernel/src/test/java/org/neo4j/graphdb/index/UniqueFactoryTest.java +++ b/community/kernel/src/test/java/org/neo4j/graphdb/index/UniqueFactoryTest.java @@ -19,13 +19,13 @@ */ package org.neo4j.graphdb.index; +import org.junit.Ignore; +import org.junit.Test; + import java.util.Collections; import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.Ignore; -import org.junit.Test; - import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; diff --git a/community/kernel/src/test/java/org/neo4j/helpers/Configuration.java b/community/kernel/src/test/java/org/neo4j/helpers/Configuration.java index 47b246ec2bdee..5a95a8dc1e260 100644 --- a/community/kernel/src/test/java/org/neo4j/helpers/Configuration.java +++ b/community/kernel/src/test/java/org/neo4j/helpers/Configuration.java @@ -19,11 +19,11 @@ */ package org.neo4j.helpers; +import org.junit.rules.ExternalResource; + import java.util.HashMap; import java.util.Map; -import org.junit.rules.ExternalResource; - import org.neo4j.graphdb.config.Setting; import org.neo4j.kernel.configuration.Config; diff --git a/community/kernel/src/test/java/org/neo4j/helpers/HostnamePortTest.java b/community/kernel/src/test/java/org/neo4j/helpers/HostnamePortTest.java index 6a9d809acb13f..263c8fc5ed5c2 100644 --- a/community/kernel/src/test/java/org/neo4j/helpers/HostnamePortTest.java +++ b/community/kernel/src/test/java/org/neo4j/helpers/HostnamePortTest.java @@ -19,19 +19,19 @@ */ package org.neo4j.helpers; +import org.junit.Test; + import java.net.InetAddress; import java.net.URI; import java.net.UnknownHostException; -import org.junit.Test; - import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -import static org.junit.Assume.assumeTrue; import static org.junit.Assume.assumeFalse; +import static org.junit.Assume.assumeTrue; public class HostnamePortTest { diff --git a/community/kernel/src/test/java/org/neo4j/helpers/MathUtilTest.java b/community/kernel/src/test/java/org/neo4j/helpers/MathUtilTest.java index 315efc9aa7d39..892e693b08176 100644 --- a/community/kernel/src/test/java/org/neo4j/helpers/MathUtilTest.java +++ b/community/kernel/src/test/java/org/neo4j/helpers/MathUtilTest.java @@ -21,8 +21,7 @@ import org.junit.Test; -import static org.junit.Assert.*; - +import static org.junit.Assert.assertFalse; import static org.neo4j.helpers.MathUtil.numbersEqual; public class MathUtilTest diff --git a/community/kernel/src/test/java/org/neo4j/helpers/ServiceTest.java b/community/kernel/src/test/java/org/neo4j/helpers/ServiceTest.java index ee25f9cd1826c..78f73167d6443 100644 --- a/community/kernel/src/test/java/org/neo4j/helpers/ServiceTest.java +++ b/community/kernel/src/test/java/org/neo4j/helpers/ServiceTest.java @@ -19,7 +19,7 @@ */ package org.neo4j.helpers; -import static org.junit.Assert.*; +import org.junit.Test; import java.io.IOException; import java.io.InputStream; @@ -27,7 +27,8 @@ import java.util.Collections; import java.util.Enumeration; -import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; public class ServiceTest { diff --git a/community/kernel/src/test/java/org/neo4j/helpers/TestFormat.java b/community/kernel/src/test/java/org/neo4j/helpers/TestFormat.java index 54350ffe4fca0..b50cbd662ed7d 100644 --- a/community/kernel/src/test/java/org/neo4j/helpers/TestFormat.java +++ b/community/kernel/src/test/java/org/neo4j/helpers/TestFormat.java @@ -19,15 +19,15 @@ */ package org.neo4j.helpers; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import org.junit.Test; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; import java.util.TimeZone; -import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; public class TestFormat { diff --git a/community/kernel/src/test/java/org/neo4j/helpers/UrisTest.java b/community/kernel/src/test/java/org/neo4j/helpers/UrisTest.java index ed6e924620b2d..f51436b9c27d3 100644 --- a/community/kernel/src/test/java/org/neo4j/helpers/UrisTest.java +++ b/community/kernel/src/test/java/org/neo4j/helpers/UrisTest.java @@ -19,15 +19,15 @@ */ package org.neo4j.helpers; +import org.junit.Test; + +import java.net.URI; + import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.nullValue; import static org.junit.Assert.assertThat; import static org.neo4j.helpers.Uris.parameter; -import java.net.URI; - -import org.junit.Test; - public class UrisTest { @Test diff --git a/community/kernel/src/test/java/org/neo4j/kernel/AvailabilityGuardTest.java b/community/kernel/src/test/java/org/neo4j/kernel/AvailabilityGuardTest.java index 2430d06bebc60..0298a31c1b2a6 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/AvailabilityGuardTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/AvailabilityGuardTest.java @@ -41,7 +41,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; - import static org.neo4j.kernel.AvailabilityGuard.availabilityRequirement; public class AvailabilityGuardTest diff --git a/community/kernel/src/test/java/org/neo4j/kernel/GraphDatabaseFacadeFactoryTest.java b/community/kernel/src/test/java/org/neo4j/kernel/GraphDatabaseFacadeFactoryTest.java index e3daa59df6812..3b04aaa3e7c4e 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/GraphDatabaseFacadeFactoryTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/GraphDatabaseFacadeFactoryTest.java @@ -39,7 +39,7 @@ import org.neo4j.kernel.lifecycle.LifeSupport; import org.neo4j.kernel.lifecycle.Lifecycle; import org.neo4j.kernel.monitoring.Monitors; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -53,8 +53,8 @@ public class GraphDatabaseFacadeFactoryTest { @Rule - public final TargetDirectory.TestDirectory dir = - TargetDirectory.testDirForTestWithEphemeralFS( new EphemeralFileSystemAbstraction(), getClass() ); + public final TestDirectory dir = + TestDirectory.testDirectory( new EphemeralFileSystemAbstraction() ); private final GraphDatabaseFacade mockFacade = mock( GraphDatabaseFacade.class ); private final GraphDatabaseFacadeFactory.Dependencies deps = 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 d7acff7ac0fd0..ec1192fa74af5 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/NeoStoreDataSourceTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/NeoStoreDataSourceTest.java @@ -44,7 +44,7 @@ import org.neo4j.logging.NullLogProvider; import org.neo4j.test.rule.NeoStoreDataSourceRule; import org.neo4j.test.rule.PageCacheRule; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.hamcrest.Matchers.equalTo; @@ -68,7 +68,7 @@ public class NeoStoreDataSourceTest public EphemeralFileSystemRule fs = new EphemeralFileSystemRule(); @Rule - public TargetDirectory.TestDirectory dir = TargetDirectory.testDirForTestWithEphemeralFS( fs.get(), getClass() ); + public TestDirectory dir = TestDirectory.testDirectory( fs.get() ); @Rule public NeoStoreDataSourceRule dsRule = new NeoStoreDataSourceRule(); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/RecoveryIT.java b/community/kernel/src/test/java/org/neo4j/kernel/RecoveryIT.java index b981df13941c3..7873ad87e1232 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/RecoveryIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/RecoveryIT.java @@ -19,13 +19,13 @@ */ package org.neo4j.kernel; +import org.junit.Rule; +import org.junit.Test; + import java.io.File; import java.io.IOException; import java.util.Arrays; -import org.junit.Rule; -import org.junit.Test; - import org.neo4j.adversaries.ClassGuardedAdversary; import org.neo4j.adversaries.CountingAdversary; import org.neo4j.graphdb.DependencyResolver; @@ -48,7 +48,7 @@ import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.test.AdversarialPageCacheGraphDatabaseFactory; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.hamcrest.Matchers.instanceOf; import static org.junit.Assert.assertEquals; @@ -57,13 +57,12 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; - import static org.neo4j.graphdb.RelationshipType.withName; public class RecoveryIT { @Rule - public final TargetDirectory.TestDirectory directory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory directory = TestDirectory.testDirectory(); @Test public void idGeneratorsRebuildAfterRecovery() throws IOException diff --git a/community/kernel/src/test/java/org/neo4j/kernel/RecoveryTest.java b/community/kernel/src/test/java/org/neo4j/kernel/RecoveryTest.java index 7f8d535b5926f..fcaeacb9d9959 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/RecoveryTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/RecoveryTest.java @@ -59,7 +59,7 @@ import org.neo4j.kernel.recovery.LatestCheckPointFinder; import org.neo4j.kernel.recovery.Recovery; import org.neo4j.storageengine.api.StorageEngine; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -80,7 +80,7 @@ public class RecoveryTest private final FileSystemAbstraction fs = new DefaultFileSystemAbstraction(); @Rule - public final TargetDirectory.TestDirectory directory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory directory = TestDirectory.testDirectory(); private final LogVersionRepository logVersionRepository = new DeadSimpleLogVersionRepository( 1L ); private final TransactionIdStore transactionIdStore = new DeadSimpleTransactionIdStore( 5L, 0, BASE_TX_COMMIT_TIMESTAMP, 0, 0 ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/TestTraversal.java b/community/kernel/src/test/java/org/neo4j/kernel/TestTraversal.java index e423553160627..a58985847c1b9 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/TestTraversal.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/TestTraversal.java @@ -20,10 +20,11 @@ package org.neo4j.kernel; import org.junit.Test; + import org.neo4j.graphdb.PathExpanders; import org.neo4j.graphdb.RelationshipType; -import static org.junit.Assert.*; +import static org.junit.Assert.assertNotNull; import static org.neo4j.graphdb.Direction.BOTH; import static org.neo4j.graphdb.Direction.INCOMING; import static org.neo4j.graphdb.Direction.OUTGOING; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/TransactionStatementSequenceTest.java b/community/kernel/src/test/java/org/neo4j/kernel/api/TransactionStatementSequenceTest.java index 0d25014298f46..32e9be06f0ea5 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/TransactionStatementSequenceTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/TransactionStatementSequenceTest.java @@ -26,8 +26,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; - -import static org.neo4j.kernel.api.KernelTransactionFactory.*; +import static org.neo4j.kernel.api.KernelTransactionFactory.kernelTransaction; public class TransactionStatementSequenceTest { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/TransactionStatementSharingTest.java b/community/kernel/src/test/java/org/neo4j/kernel/api/TransactionStatementSharingTest.java index e44dea468e15c..800718d675298 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/TransactionStatementSharingTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/TransactionStatementSharingTest.java @@ -26,7 +26,6 @@ import static org.junit.Assert.assertSame; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.verify; - import static org.neo4j.kernel.api.KernelTransactionFactory.kernelTransaction; public class TransactionStatementSharingTest diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/exception/StatusTest.java b/community/kernel/src/test/java/org/neo4j/kernel/api/exception/StatusTest.java index 87ff4d86d8459..ec4a9f3b8683a 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/exception/StatusTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/exception/StatusTest.java @@ -19,14 +19,15 @@ */ package org.neo4j.kernel.api.exception; +import org.junit.Test; + import java.util.HashSet; import java.util.Set; -import org.junit.Test; - import org.neo4j.kernel.api.exceptions.Status; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; public class StatusTest { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/index/IndexAccessorCompatibility.java b/community/kernel/src/test/java/org/neo4j/kernel/api/index/IndexAccessorCompatibility.java index 3a5ed15ca4a62..7d985423461f2 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/index/IndexAccessorCompatibility.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/index/IndexAccessorCompatibility.java @@ -35,12 +35,11 @@ import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.storageengine.api.schema.IndexReader; -import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.assertThat; - import static java.util.Arrays.asList; import static java.util.Collections.EMPTY_LIST; import static java.util.Collections.singletonList; +import static org.hamcrest.Matchers.equalTo; +import static org.junit.Assert.assertThat; public abstract class IndexAccessorCompatibility extends IndexProviderCompatibilityTestSuite.Compatibility { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/index/IndexProviderCompatibilityTestSuite.java b/community/kernel/src/test/java/org/neo4j/kernel/api/index/IndexProviderCompatibilityTestSuite.java index 49caff853aa69..5b982cc1b825b 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/index/IndexProviderCompatibilityTestSuite.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/index/IndexProviderCompatibilityTestSuite.java @@ -28,7 +28,7 @@ import org.neo4j.io.fs.DefaultFileSystemAbstraction; import org.neo4j.io.fs.FileSystemAbstraction; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import org.neo4j.test.runner.ParameterizedSuiteRunner; @RunWith( ParameterizedSuiteRunner.class ) @@ -42,7 +42,7 @@ public abstract class IndexProviderCompatibilityTestSuite { @Rule - public TargetDirectory.TestDirectory testDir = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory testDir = TestDirectory.testDirectory( getClass() ); protected File graphDbDir; protected FileSystemAbstraction fs = new DefaultFileSystemAbstraction(); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/index/NonUniqueIndexAccessorCompatibility.java b/community/kernel/src/test/java/org/neo4j/kernel/api/index/NonUniqueIndexAccessorCompatibility.java index 40054ddfe1e2e..bcf47c72d8de3 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/index/NonUniqueIndexAccessorCompatibility.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/index/NonUniqueIndexAccessorCompatibility.java @@ -27,7 +27,6 @@ import static java.util.Arrays.asList; import static java.util.Collections.EMPTY_LIST; import static java.util.Collections.singletonList; - import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/index/PreexistingIndexEntryConflictExceptionTest.java b/community/kernel/src/test/java/org/neo4j/kernel/api/index/PreexistingIndexEntryConflictExceptionTest.java index e7f0a54242615..9d92b70c93c9c 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/index/PreexistingIndexEntryConflictExceptionTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/index/PreexistingIndexEntryConflictExceptionTest.java @@ -22,7 +22,6 @@ import org.junit.Test; import static java.lang.String.format; - import static org.junit.Assert.assertEquals; public class PreexistingIndexEntryConflictExceptionTest diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/index/UniqueConstraintCompatibility.java b/community/kernel/src/test/java/org/neo4j/kernel/api/index/UniqueConstraintCompatibility.java index f0f30e5ce088b..7911a8304ebb4 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/index/UniqueConstraintCompatibility.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/index/UniqueConstraintCompatibility.java @@ -52,7 +52,7 @@ import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.lifecycle.Lifecycle; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; @@ -998,7 +998,7 @@ private static void awaitUninterruptibly( CountDownLatch latch ) // -- Set Up: Environment parts @Rule - public TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory testDirectory = TestDirectory.testDirectory( getClass() ); @Before public void setUp() { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/properties/LazyPropertyTest.java b/community/kernel/src/test/java/org/neo4j/kernel/api/properties/LazyPropertyTest.java index 3355fe50b1e7e..585209f5729f8 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/properties/LazyPropertyTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/properties/LazyPropertyTest.java @@ -19,10 +19,10 @@ */ package org.neo4j.kernel.api.properties; -import java.util.concurrent.Callable; - import org.junit.Test; +import java.util.concurrent.Callable; + import org.neo4j.helpers.ArrayUtil; import static org.junit.Assert.assertEquals; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/configuration/SettingsTest.java b/community/kernel/src/test/java/org/neo4j/kernel/configuration/SettingsTest.java index 92a03b129a6ab..ae42771cc7d96 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/configuration/SettingsTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/configuration/SettingsTest.java @@ -41,7 +41,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; - import static org.neo4j.helpers.collection.MapUtil.stringMap; import static org.neo4j.kernel.configuration.Settings.DURATION; import static org.neo4j.kernel.configuration.Settings.INTEGER; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/configuration/docs/SettingsDocumenterTest.java b/community/kernel/src/test/java/org/neo4j/kernel/configuration/docs/SettingsDocumenterTest.java index 1dc726c70d5ad..b8a8b55360e82 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/configuration/docs/SettingsDocumenterTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/configuration/docs/SettingsDocumenterTest.java @@ -29,7 +29,6 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; - import static org.neo4j.kernel.configuration.Settings.BOOLEAN; import static org.neo4j.kernel.configuration.Settings.INTEGER; import static org.neo4j.kernel.configuration.Settings.NO_DEFAULT; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/extension/KernelExtensionFactoryContractTest.java b/community/kernel/src/test/java/org/neo4j/kernel/extension/KernelExtensionFactoryContractTest.java index 8929bb9fa8f7d..931e9ff457998 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/extension/KernelExtensionFactoryContractTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/extension/KernelExtensionFactoryContractTest.java @@ -30,7 +30,7 @@ import org.neo4j.kernel.internal.EmbeddedGraphDatabase; import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -47,7 +47,7 @@ public abstract class KernelExtensionFactoryContractTest private final String key; @Rule - public TargetDirectory.TestDirectory target = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory target = TestDirectory.testDirectory( getClass() ); public KernelExtensionFactoryContractTest( String key, Class> extClass ) { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/extension/KernelExtensionsTest.java b/community/kernel/src/test/java/org/neo4j/kernel/extension/KernelExtensionsTest.java index ec07459563b48..0d9509a592217 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/extension/KernelExtensionsTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/extension/KernelExtensionsTest.java @@ -33,7 +33,6 @@ import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; - import static org.neo4j.helpers.collection.Iterables.iterable; public class KernelExtensionsTest diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/BatchTransactionApplierFacadeTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/BatchTransactionApplierFacadeTest.java index a4d5af71d8ec6..8060410bac2fe 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/BatchTransactionApplierFacadeTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/BatchTransactionApplierFacadeTest.java @@ -25,7 +25,7 @@ import org.neo4j.kernel.impl.locking.LockGroup; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.any; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.mock; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelSchemaStateStoreTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelSchemaStateStoreTest.java index 3bc60c1845ddc..002436943ba4b 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelSchemaStateStoreTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelSchemaStateStoreTest.java @@ -21,6 +21,7 @@ import org.junit.Before; import org.junit.Test; + import org.neo4j.helpers.collection.MapUtil; import org.neo4j.logging.AssertableLogProvider; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelStatementTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelStatementTest.java index 7067845bfb4c1..ffaa4a7c54da1 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelStatementTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelStatementTest.java @@ -22,10 +22,10 @@ import org.junit.Test; import org.neo4j.graphdb.TransactionTerminatedException; +import org.neo4j.kernel.api.exceptions.Status; import org.neo4j.kernel.api.security.AccessMode; import org.neo4j.kernel.impl.proc.Procedures; import org.neo4j.storageengine.api.StorageStatement; -import org.neo4j.kernel.api.exceptions.Status; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTest.java index c181a0900aaf6..57bea8b17602a 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTest.java @@ -26,16 +26,16 @@ import java.util.function.Function; import org.neo4j.graphdb.Transaction; -import org.neo4j.kernel.impl.factory.DatabaseInfo; -import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.exceptions.InvalidTransactionTypeKernelException; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; import org.neo4j.kernel.impl.factory.CommunityEditionModule; +import org.neo4j.kernel.impl.factory.DatabaseInfo; import org.neo4j.kernel.impl.factory.EditionModule; import org.neo4j.kernel.impl.factory.GraphDatabaseFacade; import org.neo4j.kernel.impl.factory.GraphDatabaseFacadeFactory; import org.neo4j.kernel.impl.factory.PlatformModule; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.test.ImpermanentGraphDatabase; import static org.hamcrest.Matchers.containsString; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionTestBase.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionTestBase.java index 75b6dc24f69df..1710f9eff5cb5 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionTestBase.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionTestBase.java @@ -20,8 +20,6 @@ package org.neo4j.kernel.impl.api; import org.junit.Before; -import org.mockito.invocation.InvocationOnMock; -import org.mockito.stubbing.Answer; import java.util.Collection; import java.util.function.Supplier; @@ -30,8 +28,6 @@ import org.neo4j.helpers.FakeClock; import org.neo4j.kernel.api.KernelTransaction.Type; import org.neo4j.kernel.api.exceptions.TransactionFailureException; -import org.neo4j.kernel.api.exceptions.schema.ConstraintValidationKernelException; -import org.neo4j.kernel.api.exceptions.schema.CreateConstraintFailureException; import org.neo4j.kernel.api.security.AccessMode; import org.neo4j.kernel.api.txstate.LegacyIndexTransactionState; import org.neo4j.kernel.impl.api.store.StoreStatement; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionsTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionsTest.java index c674984aeb000..176b5e7e90001 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionsTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionsTest.java @@ -39,7 +39,6 @@ import org.neo4j.kernel.api.exceptions.Status; import org.neo4j.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.security.AccessMode; -import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.state.ConstraintIndexCreator; import org.neo4j.kernel.impl.index.IndexConfigStore; import org.neo4j.kernel.impl.locking.Locks; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/LabelRecoveryTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/LabelRecoveryTest.java index 6060f9a5a5ba7..091c4538f6a2b 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/LabelRecoveryTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/LabelRecoveryTest.java @@ -26,11 +26,10 @@ import org.neo4j.graphdb.Label; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; -import org.neo4j.test.TestGraphDatabaseFactory; import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction; +import org.neo4j.test.TestGraphDatabaseFactory; import static org.junit.Assert.assertTrue; - import static org.neo4j.graphdb.Label.label; public class LabelRecoveryTest diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/PropertyTransactionStateTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/PropertyTransactionStateTest.java index e81dfe6ae8eff..af25aa4908146 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/PropertyTransactionStateTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/PropertyTransactionStateTest.java @@ -22,12 +22,14 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; + import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; import org.neo4j.test.TestGraphDatabaseFactory; -import static org.junit.Assert.*; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; public class PropertyTransactionStateTest { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/PropertyValueComparisonTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/PropertyValueComparisonTest.java index 350b81a4263d9..cd6501a77cd63 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/PropertyValueComparisonTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/PropertyValueComparisonTest.java @@ -19,18 +19,18 @@ */ package org.neo4j.kernel.impl.api; -import java.util.Comparator; - import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import static java.lang.String.format; +import java.util.Comparator; +import static java.lang.String.format; import static org.neo4j.kernel.impl.api.PropertyValueComparison.COMPARE_NUMBERS; import static org.neo4j.kernel.impl.api.PropertyValueComparison.COMPARE_STRINGS; import static org.neo4j.kernel.impl.api.PropertyValueComparison.COMPARE_VALUES; -import static org.neo4j.kernel.impl.api.PropertyValueComparison.SuperType.*; +import static org.neo4j.kernel.impl.api.PropertyValueComparison.SuperType.NUMBER; +import static org.neo4j.kernel.impl.api.PropertyValueComparison.SuperType.STRING; public class PropertyValueComparisonTest { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/TransactionApplierFacadeTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/TransactionApplierFacadeTest.java index 123bb7ec791e8..e887ed4481b53 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/TransactionApplierFacadeTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/TransactionApplierFacadeTest.java @@ -27,7 +27,7 @@ import org.neo4j.kernel.impl.index.IndexDefineCommand; import org.neo4j.kernel.impl.transaction.command.Command; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; import static org.mockito.Matchers.any; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.mock; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingControllerTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingControllerTest.java index 26fbb421beded..82019d665fb19 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingControllerTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingControllerTest.java @@ -39,7 +39,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; - import static org.neo4j.kernel.api.index.InternalIndexState.FAILED; import static org.neo4j.kernel.api.index.InternalIndexState.ONLINE; import static org.neo4j.kernel.api.index.InternalIndexState.POPULATING; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/BuiltinProceduresIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/BuiltinProceduresIT.java index 7d3d76ca5c9b7..76cc65213bc34 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/BuiltinProceduresIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/BuiltinProceduresIT.java @@ -29,13 +29,11 @@ import org.neo4j.kernel.api.security.AccessMode.Static; import static java.util.Collections.singletonList; - import static junit.framework.TestCase.fail; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.core.IsEqual.equalTo; - import static org.neo4j.helpers.collection.Iterators.asList; import static org.neo4j.kernel.api.proc.ProcedureSignature.procedureName; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/KernelIntegrationTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/KernelIntegrationTest.java index fd4c724dd0843..4cafbdb5f87dd 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/KernelIntegrationTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/KernelIntegrationTest.java @@ -24,8 +24,6 @@ import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction; -import org.neo4j.kernel.api.security.AccessMode; -import org.neo4j.kernel.api.dbms.DbmsOperations; import org.neo4j.kernel.api.DataWriteOperations; import org.neo4j.kernel.api.KernelAPI; import org.neo4j.kernel.api.KernelTransaction; @@ -33,8 +31,10 @@ import org.neo4j.kernel.api.SchemaWriteOperations; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.TokenWriteOperations; +import org.neo4j.kernel.api.dbms.DbmsOperations; import org.neo4j.kernel.api.exceptions.KernelException; import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.kernel.api.security.AccessMode; import org.neo4j.kernel.impl.api.index.IndexingService; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; import org.neo4j.kernel.internal.GraphDatabaseAPI; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/NodeGetUniqueFromIndexSeekIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/NodeGetUniqueFromIndexSeekIT.java index ea014c6e4bd0c..37e8f32c95f61 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/NodeGetUniqueFromIndexSeekIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/NodeGetUniqueFromIndexSeekIT.java @@ -21,6 +21,7 @@ import org.junit.Before; import org.junit.Test; + import org.neo4j.graphdb.DependencyResolver; import org.neo4j.graphdb.Transaction; import org.neo4j.kernel.api.DataWriteOperations; @@ -35,7 +36,7 @@ import org.neo4j.kernel.impl.locking.Locks; import org.neo4j.test.DoubleLatch; -import static org.junit.Assert.*; +import static org.junit.Assert.assertTrue; public class NodeGetUniqueFromIndexSeekIT extends KernelIntegrationTest { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/SchemaRecoveryIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/SchemaRecoveryIT.java index 7272031de7e6f..955de1f207225 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/SchemaRecoveryIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/SchemaRecoveryIT.java @@ -31,7 +31,7 @@ import org.neo4j.graphdb.schema.IndexDefinition; import org.neo4j.helpers.collection.Iterables; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import org.neo4j.test.subprocess.SubProcess; import static org.junit.Assert.assertEquals; @@ -59,7 +59,7 @@ public void schemaTransactionsShouldSurviveRecovery() throws Exception } @Rule - public TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory testDirectory = TestDirectory.testDirectory(); private List constraints( GraphDatabaseService database ) { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/RelationshipChangesForNodeTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/RelationshipChangesForNodeTest.java index 15a6440c4d057..0884b2cde0842 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/RelationshipChangesForNodeTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/RelationshipChangesForNodeTest.java @@ -27,7 +27,6 @@ import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; - import static org.neo4j.kernel.impl.api.store.RelationshipIterator.EMPTY; public class RelationshipChangesForNodeTest diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/DiskLayerNodeAndRelTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/DiskLayerNodeAndRelTest.java index 920c909c31170..fff509f579d3f 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/DiskLayerNodeAndRelTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/DiskLayerNodeAndRelTest.java @@ -29,7 +29,6 @@ import static junit.framework.Assert.assertFalse; import static junit.framework.TestCase.assertTrue; - import static org.neo4j.graphdb.RelationshipType.withName; import static org.neo4j.helpers.collection.MapUtil.map; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StoreNodeRelationshipCursorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StoreNodeRelationshipCursorTest.java index fd42b6a9af5a2..9874699a8ceea 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StoreNodeRelationshipCursorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StoreNodeRelationshipCursorTest.java @@ -41,9 +41,9 @@ import org.neo4j.kernel.impl.store.record.RelationshipRecord; import org.neo4j.logging.NullLogProvider; import org.neo4j.storageengine.api.Direction; -import org.neo4j.test.rule.fs.DefaultFileSystemRule; import org.neo4j.test.rule.PageCacheRule; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; +import org.neo4j.test.rule.fs.DefaultFileSystemRule; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -63,7 +63,7 @@ public class StoreNodeRelationshipCursorTest private static final long SECOND_OWNING_NODE = 2; private static final int TYPE = 0; - private final TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + private final TestDirectory testDirectory = TestDirectory.testDirectory(); private final PageCacheRule pageCacheRule = new PageCacheRule(); private final DefaultFileSystemRule fileSystemRule = new DefaultFileSystemRule(); @Rule diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StoreSingleRelationshipCursorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StoreSingleRelationshipCursorTest.java index 903287855a809..e9f4952bab12f 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StoreSingleRelationshipCursorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StoreSingleRelationshipCursorTest.java @@ -33,9 +33,9 @@ import org.neo4j.kernel.impl.store.record.RelationshipRecord; import org.neo4j.kernel.impl.util.InstanceCache; import org.neo4j.logging.NullLogProvider; -import org.neo4j.test.rule.fs.DefaultFileSystemRule; import org.neo4j.test.rule.PageCacheRule; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; +import org.neo4j.test.rule.fs.DefaultFileSystemRule; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -48,7 +48,7 @@ public class StoreSingleRelationshipCursorTest private static final long RELATIONSHIP_ID = 1L; private NeoStores neoStores; - private final TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + private final TestDirectory testDirectory = TestDirectory.testDirectory(); private final PageCacheRule pageCacheRule = new PageCacheRule(); private final DefaultFileSystemRule fileSystemRule = new DefaultFileSystemRule(); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/cache/TestClockCache.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/cache/TestClockCache.java index 74007fd16f9b5..dd66432323596 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/cache/TestClockCache.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/cache/TestClockCache.java @@ -19,18 +19,18 @@ */ package org.neo4j.kernel.impl.cache; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.fail; +import org.junit.Test; import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; -import org.junit.Test; +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.fail; public class TestClockCache { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/ManyPropertyKeysIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/ManyPropertyKeysIT.java index c2bc0dbb788a6..5b84dab86d678 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/ManyPropertyKeysIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/ManyPropertyKeysIT.java @@ -50,7 +50,7 @@ import org.neo4j.test.OtherThreadExecutor.WorkerCommand; import org.neo4j.test.TestGraphDatabaseFactory; import org.neo4j.test.rule.PageCacheRule; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertEquals; @@ -106,7 +106,7 @@ public void concurrently_creating_same_property_key_in_different_transactions_sh @Rule public final PageCacheRule pageCacheRule = new PageCacheRule(); @Rule - public final TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory testDirectory = TestDirectory.testDirectory(); private File storeDir; @Before diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/NestedTransactionLocksIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/NestedTransactionLocksIT.java index 775c11785a5ab..a7419c0cf1bc4 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/NestedTransactionLocksIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/NestedTransactionLocksIT.java @@ -19,14 +19,14 @@ */ package org.neo4j.kernel.impl.core; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; -import java.util.concurrent.TimeoutException; - import org.junit.After; import org.junit.Before; import org.junit.Test; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; +import java.util.concurrent.TimeoutException; + import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Lock; import org.neo4j.graphdb.Node; @@ -36,7 +36,6 @@ import org.neo4j.test.TestGraphDatabaseFactory; import static java.util.concurrent.TimeUnit.SECONDS; - import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotSame; import static org.junit.Assert.fail; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/NodeProxyTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/NodeProxyTest.java index 174f146aad169..d5e2189cc02bd 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/NodeProxyTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/NodeProxyTest.java @@ -45,7 +45,6 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; - import static org.neo4j.helpers.NamedThreadFactory.named; import static org.neo4j.test.DoubleLatch.awaitLatch; 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 737677b7a8bf9..561d68a681c37 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 @@ -48,8 +48,7 @@ import org.neo4j.kernel.impl.store.id.IdType; import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.TargetDirectory; -import org.neo4j.test.rule.TargetDirectory.TestDirectory; +import org.neo4j.test.rule.TestDirectory; import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.hamcrest.CoreMatchers.equalTo; @@ -71,7 +70,7 @@ public class TestCrashWithRebuildSlow public EphemeralFileSystemRule fs = new EphemeralFileSystemRule(); // for dumping data about failing build @Rule - public final TestDirectory testDir = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory testDir = TestDirectory.testDirectory(); @Test public void crashAndRebuildSlowWithDynamicStringDeletions() throws Exception diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestIsolationBasic.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestIsolationBasic.java index 2361c7e886a9f..03caf81ca3269 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestIsolationBasic.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestIsolationBasic.java @@ -19,11 +19,11 @@ */ package org.neo4j.kernel.impl.core; +import org.junit.Test; + import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicReference; -import org.junit.Test; - import org.neo4j.graphdb.Node; import org.neo4j.graphdb.PropertyContainer; import org.neo4j.graphdb.Relationship; @@ -31,7 +31,7 @@ import org.neo4j.graphdb.Transaction; import org.neo4j.kernel.impl.AbstractNeo4jTestCase; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class TestIsolationBasic extends AbstractNeo4jTestCase { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestIsolationMultipleThreads.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestIsolationMultipleThreads.java index 659dcb80d5836..4cbb554ae5137 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestIsolationMultipleThreads.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestIsolationMultipleThreads.java @@ -19,15 +19,16 @@ */ package org.neo4j.kernel.impl.core; +import org.junit.After; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; + import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.After; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Lock; import org.neo4j.graphdb.Node; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestShortStringProperties.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestShortStringProperties.java index 2deb44e43cc2a..9bea361fc8df6 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestShortStringProperties.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestShortStringProperties.java @@ -26,8 +26,8 @@ import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Relationship; -import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageEngine; import org.neo4j.kernel.impl.AbstractNeo4jTestCase; +import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageEngine; import org.neo4j.kernel.impl.store.PropertyStore; import org.neo4j.kernel.impl.store.TestShortString; import org.neo4j.test.rule.DatabaseRule; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TokenHolderTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TokenHolderTest.java index 8a15937e1b47e..45646694d0b76 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TokenHolderTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TokenHolderTest.java @@ -24,10 +24,9 @@ import java.util.HashMap; import java.util.Map; -import static java.util.Arrays.asList; - import org.neo4j.storageengine.api.Token; +import static java.util.Arrays.asList; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/event/ExpectedTransactionData.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/event/ExpectedTransactionData.java index 267c728e0faa2..75a76bf8e8ccd 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/event/ExpectedTransactionData.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/event/ExpectedTransactionData.java @@ -36,7 +36,6 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; - import static org.neo4j.kernel.impl.util.AutoCreatingHashMap.nested; class ExpectedTransactionData diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/factory/CommunityCommitProcessFactoryTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/factory/CommunityCommitProcessFactoryTest.java index 6b33444ec0e46..d10ae10aa153d 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/factory/CommunityCommitProcessFactoryTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/factory/CommunityCommitProcessFactoryTest.java @@ -32,7 +32,6 @@ import static org.hamcrest.Matchers.instanceOf; import static org.junit.Assert.assertThat; import static org.mockito.Mockito.mock; - import static org.neo4j.helpers.collection.MapUtil.stringMap; public class CommunityCommitProcessFactoryTest diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/IndexEntityTypeTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/IndexEntityTypeTest.java index 49ae07b27db13..03871f850d7da 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/IndexEntityTypeTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/IndexEntityTypeTest.java @@ -19,10 +19,10 @@ */ package org.neo4j.kernel.impl.index; -import static org.junit.Assert.assertEquals; - import org.junit.Test; +import static org.junit.Assert.assertEquals; + /* This seems like a weird test, but it's necessary because we have a binding between the Enum name and the name on the filesystem. On case-sensitive file systems, we need a consistent lower-cased name diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/locking/LockGroupTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/locking/LockGroupTest.java index c2921faf27aa1..cd5e981b45f12 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/locking/LockGroupTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/locking/LockGroupTest.java @@ -21,7 +21,9 @@ import org.junit.Test; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; public class LockGroupTest { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/locking/LockingCompatibilityTestSuite.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/locking/LockingCompatibilityTestSuite.java index 33fc9eec5214a..1f544cc1e5b2e 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/locking/LockingCompatibilityTestSuite.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/locking/LockingCompatibilityTestSuite.java @@ -33,7 +33,7 @@ import org.neo4j.storageengine.api.lock.AcquireLockTimeoutException; import org.neo4j.storageengine.api.lock.ResourceType; import org.neo4j.test.OtherThreadExecutor.WorkerCommand; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import org.neo4j.test.rule.concurrent.OtherThreadRule; import org.neo4j.test.runner.ParameterizedSuiteRunner; @@ -68,7 +68,7 @@ public abstract static class Compatibility public OtherThreadRule threadC = new OtherThreadRule<>(); @Rule - public TargetDirectory.TestDirectory testDir = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory testDir = TestDirectory.testDirectory( getClass() ); protected final Locks locks; protected final Locks.Client clientA; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/recovery/RecoveryRequiredCheckerTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/recovery/RecoveryRequiredCheckerTest.java index 746fc492cc384..954aefd48c307 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/recovery/RecoveryRequiredCheckerTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/recovery/RecoveryRequiredCheckerTest.java @@ -33,7 +33,7 @@ import org.neo4j.io.pagecache.PageCache; import org.neo4j.test.TestGraphDatabaseFactory; import org.neo4j.test.rule.PageCacheRule; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -45,8 +45,7 @@ public class RecoveryRequiredCheckerTest @Rule public final PageCacheRule pageCacheRule = new PageCacheRule(); @Rule - public TargetDirectory.TestDirectory testDirectory = - TargetDirectory.testDirForTestWithEphemeralFS( fileSystem, getClass() ); + public TestDirectory testDirectory = TestDirectory.testDirectory( fileSystem ); private File storeDir; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/AbstractDynamicStoreTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/AbstractDynamicStoreTest.java index 8d138029331ea..e1faddcd4f95e 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/AbstractDynamicStoreTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/AbstractDynamicStoreTest.java @@ -44,7 +44,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; - import static org.neo4j.kernel.impl.store.record.RecordLoad.FORCE; import static org.neo4j.kernel.impl.store.record.RecordLoad.NORMAL; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/CommonAbstractStoreTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/CommonAbstractStoreTest.java index 41c90e3525f5c..41210a5b5904d 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/CommonAbstractStoreTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/CommonAbstractStoreTest.java @@ -56,8 +56,9 @@ import org.neo4j.logging.LogProvider; import org.neo4j.logging.NullLogProvider; import org.neo4j.test.rule.PageCacheRule; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; +import static java.nio.file.StandardOpenOption.DELETE_ON_CLOSE; import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; @@ -78,13 +79,10 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.when; - -import static java.nio.file.StandardOpenOption.DELETE_ON_CLOSE; - import static org.neo4j.io.pagecache.RecordingPageCacheTracer.Event; import static org.neo4j.kernel.impl.store.record.Record.NO_NEXT_PROPERTY; import static org.neo4j.kernel.impl.store.record.Record.NO_NEXT_RELATIONSHIP; -import static org.neo4j.test.rule.TargetDirectory.testDirForTest; +import static org.neo4j.test.rule.TestDirectory.testDirectory; public class CommonAbstractStoreTest { @@ -103,7 +101,7 @@ public class CommonAbstractStoreTest private final IdType idType = IdType.RELATIONSHIP; // whatever private static final FileSystemAbstraction fs = new DefaultFileSystemAbstraction(); - private static final TargetDirectory.TestDirectory dir = testDirForTest( CommonAbstractStoreTest.class, fs ); + private static final TestDirectory dir = testDirectory( fs ); private static final PageCacheRule pageCacheRule = new PageCacheRule(); @ClassRule diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/CountsOracle.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/CountsOracle.java index e8ddd5ce5be2f..bce8b9215b10c 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/CountsOracle.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/CountsOracle.java @@ -28,7 +28,6 @@ import org.neo4j.register.Register; import static org.junit.Assert.assertEquals; - import static org.neo4j.register.Registers.newDoubleLongRegister; public class CountsOracle diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/FreeIdsAfterRecoveryTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/FreeIdsAfterRecoveryTest.java index b9f27a4689f97..227c732ad0b4f 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/FreeIdsAfterRecoveryTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/FreeIdsAfterRecoveryTest.java @@ -34,7 +34,7 @@ import org.neo4j.kernel.impl.storemigration.StoreFileType; import org.neo4j.logging.NullLogProvider; import org.neo4j.test.rule.PageCacheRule; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -44,7 +44,7 @@ public class FreeIdsAfterRecoveryTest { @Rule - public final TargetDirectory.TestDirectory directory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory directory = TestDirectory.testDirectory(); @Rule public final PageCacheRule pageCacheRule = new PageCacheRule(); private final FileSystemAbstraction fs = new DefaultFileSystemAbstraction(); 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 cab86c72f44f3..50d6122fc624b 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 @@ -51,8 +51,8 @@ import org.neo4j.kernel.impl.store.format.standard.StandardV3_0; import org.neo4j.kernel.impl.store.record.MetaDataRecord; import org.neo4j.kernel.impl.store.record.RecordLoad; -import org.neo4j.logging.LogProvider; import org.neo4j.kernel.impl.transaction.log.TransactionIdStore; +import org.neo4j.logging.LogProvider; import org.neo4j.logging.NullLogProvider; import org.neo4j.logging.NullLogger; import org.neo4j.test.rule.PageCacheRule; 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 f2ddccb56678f..50949495360e8 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 @@ -84,7 +84,7 @@ import org.neo4j.test.TestGraphDatabaseFactory; import org.neo4j.test.rule.NeoStoreDataSourceRule; import org.neo4j.test.rule.PageCacheRule; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.junit.Assert.assertArrayEquals; @@ -105,7 +105,7 @@ public class NeoStoresTest private final PageCacheRule pageCacheRule = new PageCacheRule(); private final ExpectedException exception = ExpectedException.none(); private EphemeralFileSystemRule fs = new EphemeralFileSystemRule(); - private TargetDirectory.TestDirectory dir = TargetDirectory.testDirForTestWithEphemeralFS( fs.get(), getClass() ); + private TestDirectory dir = TestDirectory.testDirectory( fs.get() ); private NeoStoreDataSourceRule dsRule = new NeoStoreDataSourceRule(); @Rule diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/RecordSizesDocTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/RecordSizesDocTest.java index 9bc75ee1e2217..c0627a34ee4cf 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/RecordSizesDocTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/RecordSizesDocTest.java @@ -23,14 +23,13 @@ import org.junit.Test; import org.neo4j.graphdb.config.Setting; -import org.neo4j.test.rule.docs.DocsIncludeFile; import org.neo4j.kernel.impl.store.format.standard.DynamicRecordFormat; import org.neo4j.kernel.impl.store.format.standard.NodeRecordFormat; import org.neo4j.kernel.impl.store.format.standard.PropertyRecordFormat; import org.neo4j.kernel.impl.store.format.standard.RelationshipRecordFormat; +import org.neo4j.test.rule.docs.DocsIncludeFile; import static java.util.Arrays.asList; - import static org.neo4j.graphdb.factory.GraphDatabaseSettings.array_block_size; import static org.neo4j.graphdb.factory.GraphDatabaseSettings.string_block_size; import static org.neo4j.kernel.impl.store.StoreFactory.NODE_STORE_NAME; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/RelationshipGroupStoreIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/RelationshipGroupStoreIT.java index a03761453df8a..7c14aaa3e8ece 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/RelationshipGroupStoreIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/RelationshipGroupStoreIT.java @@ -32,14 +32,14 @@ import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageEngine; import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.test.rule.CleanupRule; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertEquals; import static org.neo4j.helpers.collection.Iterables.count; public class RelationshipGroupStoreIT { - private final TargetDirectory.TestDirectory directory = TargetDirectory.testDirForTest( getClass() ); + private final TestDirectory directory = TestDirectory.testDirectory(); private final CleanupRule cleanupRule = new CleanupRule(); @Rule diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/RelationshipGroupStoreTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/RelationshipGroupStoreTest.java index 0c09a91c407a3..df566062fbe54 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/RelationshipGroupStoreTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/RelationshipGroupStoreTest.java @@ -50,7 +50,7 @@ import org.neo4j.logging.NullLogProvider; import org.neo4j.test.ImpermanentGraphDatabase; import org.neo4j.test.rule.PageCacheRule; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static java.lang.Integer.parseInt; import static java.util.Arrays.asList; @@ -66,7 +66,7 @@ public class RelationshipGroupStoreTest @Rule public PageCacheRule pageCacheRule = new PageCacheRule( false ); @Rule - public TargetDirectory.TestDirectory testDir = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory testDir = TestDirectory.testDirectory(); private File directory; private int defaultThreshold; private FileSystemAbstraction fs; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/StoreTypeTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/StoreTypeTest.java index 4eeadf1557ac3..521c259a41cab 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/StoreTypeTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/StoreTypeTest.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.junit.rules.ExpectedException; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class StoreTypeTest { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestArrayStore.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestArrayStore.java index cba3cc88f3666..45e251f22317f 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestArrayStore.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestArrayStore.java @@ -42,7 +42,7 @@ import org.neo4j.logging.NullLogProvider; import org.neo4j.string.UTF8; import org.neo4j.test.rule.PageCacheRule; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -52,7 +52,7 @@ public class TestArrayStore @ClassRule public static PageCacheRule pageCacheRule = new PageCacheRule(); @Rule - public TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory testDirectory = TestDirectory.testDirectory(); private DynamicArrayStore arrayStore; private NeoStores neoStores; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestBrokenStoreRecovery.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestBrokenStoreRecovery.java index 5e721ac17fae1..a4618e154c891 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestBrokenStoreRecovery.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestBrokenStoreRecovery.java @@ -30,13 +30,16 @@ import org.neo4j.kernel.impl.transaction.log.PhysicalLogFile; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertEquals; import static org.neo4j.test.ProcessTestUtil.startSubProcess; public class TestBrokenStoreRecovery { + @Rule + public final TestDirectory testDirectory = TestDirectory.testDirectory(); + /** * Creates a store with a truncated property store file that remains like * that during recovery by truncating the logical log as well. Id @@ -57,9 +60,6 @@ public void testTruncatedPropertyStore() throws Exception new TestGraphDatabaseFactory().newEmbeddedDatabase( storeDir.getAbsoluteFile() ).shutdown(); } - @Rule - public final TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); - private void trimFileToSize( File theFile, int toSize ) throws IOException { 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 bc12ef33449f8..f5b65b07d995a 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 @@ -51,7 +51,6 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; - import static org.neo4j.test.mockito.matcher.Neo4jMatchers.containsOnly; import static org.neo4j.test.mockito.matcher.Neo4jMatchers.getPropertyKeys; import static org.neo4j.test.mockito.matcher.Neo4jMatchers.hasProperty; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestGrowingFileMemoryMapping.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestGrowingFileMemoryMapping.java index 3cb2442442519..6d6e951fcfc3d 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestGrowingFileMemoryMapping.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestGrowingFileMemoryMapping.java @@ -33,13 +33,12 @@ import org.neo4j.kernel.impl.store.record.NodeRecord; import org.neo4j.logging.NullLogProvider; import org.neo4j.test.rule.PageCacheRule; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assume.assumeTrue; - import static org.neo4j.graphdb.factory.GraphDatabaseSettings.pagecache_memory; import static org.neo4j.helpers.collection.MapUtil.stringMap; import static org.neo4j.kernel.impl.store.record.RecordLoad.NORMAL; @@ -109,5 +108,5 @@ private String mmapSize( int numberOfRecords, int recordSize ) @Rule public PageCacheRule pageCacheRule = new PageCacheRule(); @Rule - public TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory testDirectory = TestDirectory.testDirectory(); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/countStore/InMemoryCountsStoreCountsSnapshotSerializerIntegrationTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/countStore/InMemoryCountsStoreCountsSnapshotSerializerIntegrationTest.java index b14a8e49ef5b2..32f31013a80d8 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/countStore/InMemoryCountsStoreCountsSnapshotSerializerIntegrationTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/countStore/InMemoryCountsStoreCountsSnapshotSerializerIntegrationTest.java @@ -35,7 +35,7 @@ import org.neo4j.kernel.impl.transaction.log.InMemoryClosableChannel; import org.neo4j.kernel.impl.transaction.log.PhysicalFlushableChannel; import org.neo4j.kernel.impl.transaction.log.ReadAheadChannel; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.neo4j.kernel.impl.store.countStore.CountsSnapshotDeserializer.deserialize; import static org.neo4j.kernel.impl.store.countStore.CountsSnapshotSerializer.serialize; @@ -46,7 +46,7 @@ public class InMemoryCountsStoreCountsSnapshotSerializerIntegrationTest { @Rule - public TargetDirectory.TestDirectory testDir = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory testDir = TestDirectory.testDirectory(); @Test public void smallWorkloadOnInMemoryLogTest() throws IOException 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 df2f9bc54d697..fcd49dd6063ee 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 @@ -51,7 +51,7 @@ import org.neo4j.register.Registers; import org.neo4j.test.TestGraphDatabaseFactory; import org.neo4j.test.rule.PageCacheRule; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.junit.Assert.assertEquals; @@ -265,8 +265,7 @@ public void shouldCreateACountStoreWhenDBContainsDenseNodes() throws IOException @Rule public EphemeralFileSystemRule fsRule = new EphemeralFileSystemRule(); @Rule - public TargetDirectory.TestDirectory testDir = TargetDirectory.testDirForTestWithEphemeralFS( fsRule.get(), - getClass() ); + public TestDirectory testDir = TestDirectory.testDirectory( fsRule.get() ); private FileSystemAbstraction fs; private File dir; 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 4b336ade9beac..8574c1a78d231 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 @@ -61,7 +61,7 @@ import org.neo4j.test.AdversarialPageCacheGraphDatabaseFactory; import org.neo4j.test.TestGraphDatabaseFactory; import org.neo4j.test.rule.PageCacheRule; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.hamcrest.Matchers.instanceOf; @@ -274,8 +274,7 @@ private void checkPoint( GraphDatabaseAPI db ) throws IOException @Rule public EphemeralFileSystemRule fsRule = new EphemeralFileSystemRule(); @Rule - public TargetDirectory.TestDirectory testDir = TargetDirectory.testDirForTestWithEphemeralFS( fsRule.get(), - getClass() ); + public TestDirectory testDir = TestDirectory.testDirectory( fsRule.get() ); private FileSystemAbstraction fs; private File dir; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/id/BufferingIdGeneratorFactoryTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/id/BufferingIdGeneratorFactoryTest.java index 45aefae0e1ea7..ac9811e3573a8 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/id/BufferingIdGeneratorFactoryTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/id/BufferingIdGeneratorFactoryTest.java @@ -27,8 +27,8 @@ import org.neo4j.helpers.FakeClock; import org.neo4j.kernel.impl.api.KernelTransactionsSnapshot; -import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import org.neo4j.kernel.impl.store.id.configuration.CommunityIdTypeConfigurationProvider; +import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static java.util.concurrent.TimeUnit.MINUTES; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/id/FreeIdKeeperTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/id/FreeIdKeeperTest.java index 79b255445c9e3..ad3ba54cb9846 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/id/FreeIdKeeperTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/id/FreeIdKeeperTest.java @@ -19,6 +19,17 @@ */ package org.neo4j.kernel.impl.store.id; +import org.junit.Test; + +import java.io.File; +import java.nio.ByteBuffer; +import java.util.HashSet; +import java.util.Set; + +import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction; +import org.neo4j.io.fs.FileSystemAbstraction; +import org.neo4j.io.fs.StoreChannel; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.mockito.Matchers.any; @@ -30,16 +41,6 @@ import static org.mockito.Mockito.verifyZeroInteractions; import static org.neo4j.kernel.impl.store.id.FreeIdKeeper.NO_RESULT; -import java.io.File; -import java.nio.ByteBuffer; -import java.util.HashSet; -import java.util.Set; - -import org.junit.Test; -import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction; -import org.neo4j.io.fs.FileSystemAbstraction; -import org.neo4j.io.fs.StoreChannel; - public class FreeIdKeeperTest { @Test diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/kvstore/KeyValueMergerTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/kvstore/KeyValueMergerTest.java index cbc9e70215b0f..bd5ac35e44f80 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/kvstore/KeyValueMergerTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/kvstore/KeyValueMergerTest.java @@ -19,17 +19,15 @@ */ package org.neo4j.kernel.impl.store.kvstore; +import org.junit.Test; + import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.junit.Test; - import static java.util.Arrays.asList; - import static org.junit.Assert.assertEquals; - import static org.neo4j.kernel.impl.store.kvstore.KeyValueMergerTest.Pair.pair; public class KeyValueMergerTest diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/UpgradableDatabaseTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/UpgradableDatabaseTest.java index 24caa2e3dbf10..adc5e63fa6f23 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/UpgradableDatabaseTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/UpgradableDatabaseTest.java @@ -46,7 +46,7 @@ import org.neo4j.kernel.impl.storemigration.legacystore.LegacyStoreVersionCheck; import org.neo4j.string.UTF8; import org.neo4j.test.rule.PageCacheRule; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -66,7 +66,7 @@ public class UpgradableDatabaseTest public static class SupportedVersions { @Rule - public final TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory testDirectory = TestDirectory.testDirectory(); @Parameterized.Parameter( 0 ) public String version; @@ -201,7 +201,7 @@ public void shouldRejectStoresIfDBIsNotShutdownCleanly() throws IOException public static class UnsupportedVersions { @Rule - public final TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory testDirectory = TestDirectory.testDirectory(); @Parameterized.Parameter( 0 ) public String version; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacylogs/LegacyLogEntryWriterTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacylogs/LegacyLogEntryWriterTest.java index ab66f838dfa16..25667d41c19f8 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacylogs/LegacyLogEntryWriterTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacylogs/LegacyLogEntryWriterTest.java @@ -19,13 +19,13 @@ */ package org.neo4j.kernel.impl.storemigration.legacylogs; +import org.junit.Test; + import java.io.File; import java.io.IOException; import java.util.Arrays; import java.util.function.Function; -import org.junit.Test; - import org.neo4j.cursor.IOCursor; import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction; import org.neo4j.io.fs.FileSystemAbstraction; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacylogs/LegacyLogsTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacylogs/LegacyLogsTest.java index 415147402754d..7c5f1fb05a784 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacylogs/LegacyLogsTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacylogs/LegacyLogsTest.java @@ -55,7 +55,6 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static org.neo4j.kernel.impl.store.record.Record.NO_LABELS_FIELD; import static org.neo4j.kernel.impl.storemigration.legacylogs.LegacyLogFilenames.getLegacyLogFilename; import static org.neo4j.kernel.impl.storemigration.legacylogs.LegacyLogFilenames.versionedLegacyLogFilesFilter; import static org.neo4j.kernel.impl.transaction.log.PhysicalLogFile.DEFAULT_NAME; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/DeferredIndexedConflictResolutionTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/DeferredIndexedConflictResolutionTest.java index 98033886ab5e1..e08c571bedf7a 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/DeferredIndexedConflictResolutionTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/DeferredIndexedConflictResolutionTest.java @@ -43,7 +43,7 @@ import org.neo4j.kernel.impl.store.record.NodeRecord; import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.is; @@ -58,7 +58,7 @@ public class DeferredIndexedConflictResolutionTest { @ClassRule - public static TargetDirectory.TestDirectory storePath = TargetDirectory.testDirForTest( IndexLookupTest.class ); + public static TestDirectory storePath = TestDirectory.testDirectory(); private NodeRecord nodeRecord; private PropertyStore propertyStore; private NodeStore nodeStore; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/DuplicatePropertyRemoverTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/DuplicatePropertyRemoverTest.java index 4ceda3f25d60a..5d925d6369dfe 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/DuplicatePropertyRemoverTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/DuplicatePropertyRemoverTest.java @@ -48,7 +48,7 @@ import org.neo4j.kernel.impl.store.record.Record; import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -60,7 +60,7 @@ public class DuplicatePropertyRemoverTest { @ClassRule - public static TargetDirectory.TestDirectory storePath = TargetDirectory.testDirForTest( IndexLookupTest.class ); + public static TestDirectory storePath = TestDirectory.testDirectory(); private static int PROPERTY_COUNT = 1_000; private static GraphDatabaseAPI api; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/participant/StoreMigratorIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/participant/StoreMigratorIT.java index 407cd7c9a015f..6f267de125cb8 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/participant/StoreMigratorIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/participant/StoreMigratorIT.java @@ -53,8 +53,7 @@ import org.neo4j.kernel.impl.storemigration.monitoring.SilentMigrationProgressMonitor; import org.neo4j.kernel.impl.transaction.log.LogPosition; import org.neo4j.test.rule.PageCacheRule; -import org.neo4j.test.rule.TargetDirectory; -import org.neo4j.test.rule.TargetDirectory.TestDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -66,7 +65,7 @@ public class StoreMigratorIT { @Rule - public final TestDirectory directory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory directory = TestDirectory.testDirectory(); @Rule public final PageCacheRule pageCacheRule = new PageCacheRule(); public final FileSystemAbstraction fs = new DefaultFileSystemAbstraction(); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/participant/StoreMigratorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/participant/StoreMigratorTest.java index e259d892d807f..08abb76110add 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/participant/StoreMigratorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/participant/StoreMigratorTest.java @@ -40,7 +40,7 @@ import org.neo4j.kernel.impl.transaction.log.NoSuchTransactionException; import org.neo4j.test.rule.PageCacheRule; import org.neo4j.test.rule.RandomRule; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; @@ -58,7 +58,7 @@ public class StoreMigratorTest { private final FileSystemAbstraction fs = new DefaultFileSystemAbstraction(); - private final TargetDirectory.TestDirectory directory = TargetDirectory.testDirForTest( getClass() ); + private final TestDirectory directory = TestDirectory.testDirectory(); private final PageCacheRule pageCacheRule = new PageCacheRule(); private final RandomRule random = new RandomRule(); private final SchemaIndexProvider schemaIndexProvider = new InMemoryIndexProvider(); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/CommitContentionTests.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/CommitContentionTests.java index f789517adea48..94acf2ea4a5e0 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/CommitContentionTests.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/CommitContentionTests.java @@ -19,16 +19,16 @@ */ package org.neo4j.kernel.impl.transaction; -import java.io.File; -import java.util.Map; -import java.util.concurrent.Semaphore; -import java.util.concurrent.atomic.AtomicReference; - import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import java.io.File; +import java.util.Map; +import java.util.concurrent.Semaphore; +import java.util.concurrent.atomic.AtomicReference; + import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.factory.GraphDatabaseFactoryState; @@ -38,7 +38,7 @@ import org.neo4j.kernel.impl.factory.GraphDatabaseFacade; import org.neo4j.kernel.impl.factory.GraphDatabaseFacadeFactory; import org.neo4j.kernel.impl.factory.PlatformModule; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static java.util.Collections.emptyMap; import static java.util.concurrent.TimeUnit.SECONDS; @@ -46,8 +46,7 @@ public class CommitContentionTests { @Rule - public final TargetDirectory.TestDirectory storeLocation = - TargetDirectory.testDirForTest( CommitContentionTests.class ); + public final TestDirectory storeLocation = TestDirectory.testDirectory(); final Semaphore semaphore1 = new Semaphore( 1 ); final Semaphore semaphore2 = new Semaphore( 1 ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/LogPositionMarkerTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/LogPositionMarkerTest.java index 8873674d210ec..b29084b1ade4d 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/LogPositionMarkerTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/LogPositionMarkerTest.java @@ -19,10 +19,11 @@ */ package org.neo4j.kernel.impl.transaction; +import org.junit.Test; + import org.neo4j.kernel.impl.transaction.log.LogPosition; import org.neo4j.kernel.impl.transaction.log.LogPositionMarker; -import org.junit.Test; import static org.junit.Assert.assertEquals; public class LogPositionMarkerTest diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/PartialTransactionFailureIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/PartialTransactionFailureIT.java index cbf5e7b5c0d7e..9757130dd5d08 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/PartialTransactionFailureIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/PartialTransactionFailureIT.java @@ -19,15 +19,15 @@ */ package org.neo4j.kernel.impl.transaction; +import org.junit.Rule; +import org.junit.Test; + import java.io.File; import java.util.Arrays; import java.util.Iterator; import java.util.Map; import java.util.concurrent.CountDownLatch; -import org.junit.Rule; -import org.junit.Test; - import org.neo4j.adversaries.ClassGuardedAdversary; import org.neo4j.adversaries.CountingAdversary; import org.neo4j.adversaries.fs.AdversarialFileSystemAbstraction; @@ -50,12 +50,11 @@ import org.neo4j.kernel.impl.transaction.log.checkpoint.SimpleTriggerInfo; import org.neo4j.kernel.impl.transaction.log.rotation.LogRotation; import org.neo4j.kernel.internal.EmbeddedGraphDatabase; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.fail; - import static org.neo4j.helpers.collection.MapUtil.stringMap; /** @@ -65,8 +64,7 @@ public class PartialTransactionFailureIT { @Rule - public TargetDirectory.TestDirectory dir = - TargetDirectory.testDirForTest( PartialTransactionFailureIT.class ); + public TestDirectory dir = TestDirectory.testDirectory(); @Test public void concurrentlyCommittingTransactionsMustNotRotateOutLoggedCommandsOfFailingTransaction() diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/ReadAheadLogChannelTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/ReadAheadLogChannelTest.java index ec90a5316ec9e..d4c729ef2df85 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/ReadAheadLogChannelTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/ReadAheadLogChannelTest.java @@ -34,7 +34,7 @@ import org.neo4j.kernel.impl.transaction.log.LogVersionedStoreChannel; import org.neo4j.kernel.impl.transaction.log.PhysicalLogVersionedStoreChannel; import org.neo4j.kernel.impl.transaction.log.ReadAheadLogChannel; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -160,7 +160,7 @@ private void writeSomeData( File file, Visitor visitor private final FileSystemAbstraction fs = new DefaultFileSystemAbstraction(); @Rule - public final TargetDirectory.TestDirectory directory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory directory = TestDirectory.testDirectory(); private File file( int index ) { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/SynchronizedArrayIdOrderingQueueStressTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/SynchronizedArrayIdOrderingQueueStressTest.java index a207340c95db4..d498ac0b4e5aa 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/SynchronizedArrayIdOrderingQueueStressTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/SynchronizedArrayIdOrderingQueueStressTest.java @@ -19,24 +19,22 @@ */ package org.neo4j.kernel.impl.transaction; -import static java.lang.System.currentTimeMillis; -import static java.util.concurrent.TimeUnit.SECONDS; - -import static org.junit.Assert.assertTrue; - -import static org.neo4j.test.DoubleLatch.awaitLatch; +import org.junit.Test; import java.util.Random; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import org.junit.Test; - import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.kernel.impl.util.IdOrderingQueue; import org.neo4j.kernel.impl.util.SynchronizedArrayIdOrderingQueue; +import static java.lang.System.currentTimeMillis; +import static java.util.concurrent.TimeUnit.SECONDS; +import static org.junit.Assert.assertTrue; +import static org.neo4j.test.DoubleLatch.awaitLatch; + public class SynchronizedArrayIdOrderingQueueStressTest { @Test diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/IndexWorkSyncTransactionApplicationStressIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/IndexWorkSyncTransactionApplicationStressIT.java index 63bd9ec128cce..d6765c2847143 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/IndexWorkSyncTransactionApplicationStressIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/IndexWorkSyncTransactionApplicationStressIT.java @@ -54,7 +54,7 @@ import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.test.rule.PageCacheRule; import org.neo4j.test.rule.RecordStorageEngineRule; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import org.neo4j.unsafe.impl.batchimport.cache.idmapping.string.Workers; import static java.util.Arrays.asList; @@ -70,7 +70,7 @@ public class IndexWorkSyncTransactionApplicationStressIT { private final FileSystemAbstraction fs = new DefaultFileSystemAbstraction(); private final RecordStorageEngineRule storageEngineRule = new RecordStorageEngineRule(); - private final TargetDirectory.TestDirectory directory = TargetDirectory.testDirForTest( getClass() ); + private final TestDirectory directory = TestDirectory.testDirectory(); private final PageCacheRule pageCacheRule = new PageCacheRule(); @Rule diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/FakeCommitment.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/FakeCommitment.java index d77cc8c6e3411..e6cc2db776c99 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/FakeCommitment.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/FakeCommitment.java @@ -19,8 +19,6 @@ */ package org.neo4j.kernel.impl.transaction.log; -import static org.neo4j.kernel.impl.transaction.log.TransactionIdStore.BASE_TX_COMMIT_TIMESTAMP; - public class FakeCommitment implements Commitment { public static final int CHECKSUM = 3; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/FilteringIOCursorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/FilteringIOCursorTest.java index e76f9cc9c5af9..2a9349d7d1348 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/FilteringIOCursorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/FilteringIOCursorTest.java @@ -29,9 +29,9 @@ import static java.util.Arrays.asList; import static org.junit.Assert.assertEquals; +import static org.neo4j.function.Predicates.alwaysTrue; import static org.neo4j.function.Predicates.in; import static org.neo4j.function.Predicates.not; -import static org.neo4j.function.Predicates.alwaysTrue; public class FilteringIOCursorTest { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/PhysicalFlushableChannelTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/PhysicalFlushableChannelTest.java index dfd8c2b77cffa..f1182f522d768 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/PhysicalFlushableChannelTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/PhysicalFlushableChannelTest.java @@ -33,8 +33,7 @@ import org.neo4j.io.fs.DefaultFileSystemAbstraction; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.fs.StoreChannel; -import org.neo4j.test.rule.TargetDirectory; -import org.neo4j.test.rule.TargetDirectory.TestDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -266,5 +265,5 @@ private ByteBuffer readFile( File file ) throws IOException private final FileSystemAbstraction fs = new DefaultFileSystemAbstraction(); @Rule - public final TestDirectory directory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory directory = TestDirectory.testDirectory(); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/PhysicalLogFileTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/PhysicalLogFileTest.java index 1931e0b0f123c..0ebf0702c7e08 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/PhysicalLogFileTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/PhysicalLogFileTest.java @@ -33,8 +33,7 @@ import org.neo4j.kernel.impl.transaction.log.PhysicalLogFile.Monitor; import org.neo4j.kernel.impl.transaction.log.entry.LogHeader; import org.neo4j.kernel.lifecycle.LifeSupport; -import org.neo4j.test.rule.TargetDirectory; -import org.neo4j.test.rule.TargetDirectory.TestDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -46,7 +45,7 @@ public class PhysicalLogFileTest { @Rule - public final TestDirectory directory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory directory = TestDirectory.testDirectory(); private final FileSystemAbstraction fs = new DefaultFileSystemAbstraction(); private final LogVersionRepository logVersionRepository = new DeadSimpleLogVersionRepository( 1L ); private final TransactionIdStore transactionIdStore = diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/PhysicalLogicalTransactionStoreTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/PhysicalLogicalTransactionStoreTest.java index 68b82bd689769..9bb067c32c3dd 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/PhysicalLogicalTransactionStoreTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/PhysicalLogicalTransactionStoreTest.java @@ -50,7 +50,7 @@ import org.neo4j.kernel.monitoring.Monitors; import org.neo4j.kernel.recovery.Recovery; import org.neo4j.storageengine.api.StorageCommand; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -64,7 +64,6 @@ import static org.neo4j.kernel.impl.transaction.log.entry.LogVersions.CURRENT_LOG_VERSION; import static org.neo4j.kernel.impl.transaction.log.rotation.LogRotation.NO_ROTATION; import static org.neo4j.kernel.impl.util.IdOrderingQueue.BYPASS; -import static org.neo4j.test.rule.TargetDirectory.testDirForTest; public class PhysicalLogicalTransactionStoreTest { @@ -72,7 +71,7 @@ public class PhysicalLogicalTransactionStoreTest private final FileSystemAbstraction fs = new DefaultFileSystemAbstraction(); @Rule - public TargetDirectory.TestDirectory dir = testDirForTest( getClass() ); + public TestDirectory dir = TestDirectory.testDirectory(); private File testDir; @Before diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/ReadAheadChannelTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/ReadAheadChannelTest.java index d7a51fd825fa2..1a6635cc2527b 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/ReadAheadChannelTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/ReadAheadChannelTest.java @@ -19,19 +19,20 @@ */ package org.neo4j.kernel.impl.transaction.log; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import org.junit.Test; import java.io.File; import java.io.IOException; import java.nio.ByteBuffer; -import org.junit.Test; import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.fs.StoreChannel; import org.neo4j.storageengine.api.ReadPastEndException; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + public class ReadAheadChannelTest { @Test diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/entry/LogHeaderReaderTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/entry/LogHeaderReaderTest.java index eecfb4a49110f..ed7e4154c8699 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/entry/LogHeaderReaderTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/entry/LogHeaderReaderTest.java @@ -19,16 +19,16 @@ */ package org.neo4j.kernel.impl.transaction.log.entry; +import org.junit.Test; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; + import java.io.File; import java.io.IOException; import java.io.OutputStream; import java.nio.ByteBuffer; import java.nio.channels.ReadableByteChannel; -import org.junit.Test; -import org.mockito.invocation.InvocationOnMock; -import org.mockito.stubbing.Answer; - import org.neo4j.io.fs.DefaultFileSystemAbstraction; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.kernel.impl.transaction.log.InMemoryClosableChannel; @@ -38,7 +38,6 @@ import static org.junit.Assert.fail; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; - import static org.neo4j.kernel.impl.transaction.log.entry.LogHeader.LOG_HEADER_SIZE; import static org.neo4j.kernel.impl.transaction.log.entry.LogHeaderReader.readLogHeader; import static org.neo4j.kernel.impl.transaction.log.entry.LogHeaderWriter.encodeLogVersion; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/pruning/LogPruneStrategyFactoryTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/pruning/LogPruneStrategyFactoryTest.java index 02f7084235cd8..eccbc8a468e8f 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/pruning/LogPruneStrategyFactoryTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/pruning/LogPruneStrategyFactoryTest.java @@ -21,6 +21,7 @@ import org.junit.Test; import org.mockito.Mockito; + import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.kernel.impl.transaction.log.pruning.ThresholdConfigParser.ThresholdConfigValue; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/pruning/ThresholdConfigValueTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/pruning/ThresholdConfigValueTest.java index affcb8ce5757e..9ca695b2b2ef7 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/pruning/ThresholdConfigValueTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/pruning/ThresholdConfigValueTest.java @@ -19,12 +19,12 @@ */ package org.neo4j.kernel.impl.transaction.log.pruning; +import org.junit.Test; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertSame; import static org.junit.Assert.fail; -import org.junit.Test; - public class ThresholdConfigValueTest { @Test diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/stresstest/TransactionAppenderStressTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/stresstest/TransactionAppenderStressTest.java index 2dacdbf0830f2..c793eef137c6b 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/stresstest/TransactionAppenderStressTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/stresstest/TransactionAppenderStressTest.java @@ -42,7 +42,7 @@ import org.neo4j.kernel.impl.transaction.log.entry.OnePhaseCommit; import org.neo4j.kernel.impl.transaction.log.entry.VersionAwareLogEntryReader; import org.neo4j.kernel.impl.transaction.log.stresstest.workload.Runner; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static java.lang.System.currentTimeMillis; import static java.util.concurrent.TimeUnit.SECONDS; @@ -51,7 +51,7 @@ public class TransactionAppenderStressTest { @Rule - public final TargetDirectory.TestDirectory directory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory directory = TestDirectory.testDirectory( ); @Test public void concurrentTransactionAppendingTest() throws Exception diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/stresstest/workload/Runner.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/stresstest/workload/Runner.java index 19e7d874b449f..031dae911697c 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/stresstest/workload/Runner.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/stresstest/workload/Runner.java @@ -28,7 +28,6 @@ import org.neo4j.graphdb.factory.GraphDatabaseSettings; import org.neo4j.io.fs.DefaultFileSystemAbstraction; -import org.neo4j.kernel.internal.KernelEventHandlers; import org.neo4j.kernel.configuration.Settings; import org.neo4j.kernel.impl.core.DatabasePanicEventGenerator; import org.neo4j.kernel.impl.transaction.DeadSimpleLogVersionRepository; @@ -45,6 +44,7 @@ import org.neo4j.kernel.impl.transaction.log.rotation.LogRotationImpl; import org.neo4j.kernel.impl.util.IdOrderingQueue; import org.neo4j.kernel.internal.DatabaseHealth; +import org.neo4j.kernel.internal.KernelEventHandlers; import org.neo4j.kernel.lifecycle.Lifespan; import org.neo4j.logging.Log; import org.neo4j.logging.NullLog; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/RecoveryVisitorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/RecoveryVisitorTest.java index fa4a276dbebe7..67b2b7b9aa571 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/RecoveryVisitorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/RecoveryVisitorTest.java @@ -43,7 +43,6 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; - import static org.neo4j.storageengine.api.TransactionApplicationMode.RECOVERY; public class RecoveryVisitorTest diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/TestCommandMode.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/TestCommandMode.java index 1ca292e85db63..69ecf2b6f80d8 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/TestCommandMode.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/TestCommandMode.java @@ -19,13 +19,12 @@ */ package org.neo4j.kernel.impl.transaction.state; +import org.junit.Test; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.IsEqual.equalTo; - import static org.neo4j.kernel.impl.transaction.command.Command.Mode.fromRecordState; -import org.junit.Test; - public class TestCommandMode { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/AsOneStartBranchTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/AsOneStartBranchTest.java index 6d6d2568005a9..3e2c3a5e8383b 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/AsOneStartBranchTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/AsOneStartBranchTest.java @@ -19,10 +19,10 @@ */ package org.neo4j.kernel.impl.traversal; -import java.util.Iterator; - import org.junit.Test; +import java.util.Iterator; + import org.neo4j.graphdb.Node; import org.neo4j.graphdb.traversal.InitialBranchState; import org.neo4j.graphdb.traversal.TraversalContext; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/CircularGraphTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/CircularGraphTest.java index c6743b23ead07..8c05b859e4eb7 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/CircularGraphTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/CircularGraphTest.java @@ -19,11 +19,11 @@ */ package org.neo4j.kernel.impl.traversal; -import java.util.Iterator; - import org.junit.Before; import org.junit.Test; +import java.util.Iterator; + import org.neo4j.graphdb.Direction; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Path; @@ -32,6 +32,7 @@ import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.traversal.Evaluation; import org.neo4j.graphdb.traversal.Evaluator; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/DepthPitfallGraphTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/DepthPitfallGraphTest.java index 7e8d235c37562..2e25896bdf749 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/DepthPitfallGraphTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/DepthPitfallGraphTest.java @@ -19,13 +19,13 @@ */ package org.neo4j.kernel.impl.traversal; +import org.junit.Before; +import org.junit.Test; + import java.util.Arrays; import java.util.HashSet; import java.util.Set; -import org.junit.Before; -import org.junit.Test; - import org.neo4j.graphdb.Path; import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.traversal.TraversalDescription; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestBidirectionalTraversal.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestBidirectionalTraversal.java index b8f9ccd98d40d..19ffcb53b17fe 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestBidirectionalTraversal.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestBidirectionalTraversal.java @@ -19,12 +19,12 @@ */ package org.neo4j.kernel.impl.traversal; -import java.util.function.Predicate; - import org.junit.After; import org.junit.Before; import org.junit.Test; +import java.util.function.Predicate; + import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Path; import org.neo4j.graphdb.PathExpander; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestMultiPruneEvaluators.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestMultiPruneEvaluators.java index e463fef954c8a..f6304fe36d47f 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestMultiPruneEvaluators.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestMultiPruneEvaluators.java @@ -19,12 +19,12 @@ */ package org.neo4j.kernel.impl.traversal; -import java.util.HashSet; -import java.util.Set; - import org.junit.Before; import org.junit.Test; +import java.util.HashSet; +import java.util.Set; + import org.neo4j.graphdb.Direction; import org.neo4j.graphdb.Path; import org.neo4j.graphdb.Transaction; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestMultiRelTypesAndDirections.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestMultiRelTypesAndDirections.java index 2c92f235f5fa0..04f32b0cb87e3 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestMultiRelTypesAndDirections.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestMultiRelTypesAndDirections.java @@ -21,13 +21,14 @@ import org.junit.Before; import org.junit.Test; + import org.neo4j.graphdb.Path; import org.neo4j.graphdb.PathExpanders; import org.neo4j.graphdb.RelationshipType; import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.traversal.TraversalDescription; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import static org.neo4j.graphdb.Direction.OUTGOING; import static org.neo4j.graphdb.RelationshipType.withName; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestMultipleFilters.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestMultipleFilters.java index b241cdd1adc98..8a13abf4b50d0 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestMultipleFilters.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestMultipleFilters.java @@ -19,12 +19,12 @@ */ package org.neo4j.kernel.impl.traversal; -import java.util.function.Predicate; - import org.junit.After; import org.junit.Before; import org.junit.Test; +import java.util.function.Predicate; + import org.neo4j.graphdb.Direction; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Path; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestMultipleStartNodes.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestMultipleStartNodes.java index f845c069675ae..a46984220a562 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestMultipleStartNodes.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestMultipleStartNodes.java @@ -20,6 +20,7 @@ package org.neo4j.kernel.impl.traversal; import org.junit.Test; + import org.neo4j.graphdb.Node; import org.neo4j.graphdb.RelationshipType; import org.neo4j.graphdb.Transaction; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestOrderByTypeExpander.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestOrderByTypeExpander.java index cc351a43b469b..a05a7c12f5f32 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestOrderByTypeExpander.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestOrderByTypeExpander.java @@ -19,17 +19,19 @@ */ package org.neo4j.kernel.impl.traversal; -import java.util.Iterator; - import org.junit.Before; import org.junit.Test; + +import java.util.Iterator; + import org.neo4j.graphdb.Node; import org.neo4j.graphdb.PathExpander; import org.neo4j.graphdb.RelationshipType; import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.impl.OrderedByTypeExpander; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.neo4j.graphdb.Direction.INCOMING; import static org.neo4j.graphdb.Direction.OUTGOING; import static org.neo4j.graphdb.RelationshipType.withName; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestSorting.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestSorting.java index 52938538bc089..fc57034432682 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestSorting.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestSorting.java @@ -19,12 +19,12 @@ */ package org.neo4j.kernel.impl.traversal; +import org.junit.Test; + import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.junit.Test; - import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; import org.neo4j.helpers.collection.Iterables; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestTraversalWithIterable.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestTraversalWithIterable.java index 90e9445abfe35..1dbc11c70d8f0 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestTraversalWithIterable.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestTraversalWithIterable.java @@ -19,11 +19,11 @@ */ package org.neo4j.kernel.impl.traversal; +import org.junit.Test; + import java.util.ArrayList; import java.util.Collection; -import org.junit.Test; - import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Path; import org.neo4j.graphdb.RelationshipType; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestTraversalWithLoops.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestTraversalWithLoops.java index f14cc61e3b4b5..3cbc6ca50c7c2 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestTraversalWithLoops.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestTraversalWithLoops.java @@ -20,6 +20,7 @@ package org.neo4j.kernel.impl.traversal; import org.junit.Test; + import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Path; import org.neo4j.graphdb.Transaction; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestUniqueness.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestUniqueness.java index e8eba166d33e8..f70d3af41f83b 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestUniqueness.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TestUniqueness.java @@ -19,10 +19,10 @@ */ package org.neo4j.kernel.impl.traversal; -import java.util.Iterator; - import org.junit.Test; +import java.util.Iterator; + import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Path; import org.neo4j.graphdb.RelationshipType; @@ -34,7 +34,6 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; - import static org.neo4j.graphdb.Direction.OUTGOING; import static org.neo4j.graphdb.RelationshipType.withName; import static org.neo4j.graphdb.traversal.Evaluators.includeWhereEndNodeIs; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TreeGraphTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TreeGraphTest.java index ddbba050f9fe6..e42759f72a759 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TreeGraphTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TreeGraphTest.java @@ -19,14 +19,15 @@ */ package org.neo4j.kernel.impl.traversal; +import org.junit.Before; +import org.junit.Test; + import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.Stack; -import org.junit.Before; -import org.junit.Test; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Path; import org.neo4j.graphdb.Relationship; @@ -34,7 +35,9 @@ import org.neo4j.graphdb.traversal.Traverser; import static java.util.Arrays.asList; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import static org.neo4j.graphdb.traversal.BranchOrderingPolicies.POSTORDER_BREADTH_FIRST; import static org.neo4j.graphdb.traversal.BranchOrderingPolicies.POSTORDER_DEPTH_FIRST; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/AutoCreatingHashMapTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/AutoCreatingHashMapTest.java index 5ad9900dd595c..40f096b4e8177 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/AutoCreatingHashMapTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/AutoCreatingHashMapTest.java @@ -19,14 +19,14 @@ */ package org.neo4j.kernel.impl.util; +import org.junit.Test; + import java.util.Map; import java.util.concurrent.atomic.AtomicLong; -import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; - import static org.neo4j.kernel.impl.util.AutoCreatingHashMap.nested; import static org.neo4j.kernel.impl.util.AutoCreatingHashMap.values; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/ConvertersTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/ConvertersTest.java index a8daf2ffb2fec..f7d9c20e0dd47 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/ConvertersTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/ConvertersTest.java @@ -25,8 +25,7 @@ import java.io.File; import java.io.IOException; -import org.neo4j.test.rule.TargetDirectory; -import org.neo4j.test.rule.TargetDirectory.TestDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertArrayEquals; import static org.neo4j.kernel.impl.util.Converters.regexFiles; @@ -34,7 +33,7 @@ public class ConvertersTest { @Rule - public final TestDirectory directory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory directory = TestDirectory.testDirectory(); @Test public void shouldSortFilesByNumberCleverly() throws Exception diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/DebugUtilTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/DebugUtilTest.java index b9fc537fcd1af..36de118e3a84a 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/DebugUtilTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/DebugUtilTest.java @@ -33,7 +33,6 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; - import static org.neo4j.test.DoubleLatch.awaitLatch; public class DebugUtilTest diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/FileUtilsTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/FileUtilsTest.java index e8c80707be60c..c37d54a5bf97a 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/FileUtilsTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/FileUtilsTest.java @@ -27,7 +27,7 @@ import java.io.IOException; import org.neo4j.io.fs.FileUtils; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -36,7 +36,7 @@ public class FileUtilsTest { @Rule - public TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory testDirectory = TestDirectory.testDirectory(); private File path; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/LazySingleReferenceTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/LazySingleReferenceTest.java index 06e5fc7d5ea4c..4c979c88d7320 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/LazySingleReferenceTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/LazySingleReferenceTest.java @@ -19,21 +19,20 @@ */ package org.neo4j.kernel.impl.util; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.Future; -import java.util.concurrent.atomic.AtomicInteger; - import org.junit.After; import org.junit.Before; import org.junit.Test; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.Future; +import java.util.concurrent.atomic.AtomicInteger; + import org.neo4j.test.OtherThreadExecutor; import org.neo4j.test.OtherThreadExecutor.WorkerCommand; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; - import static org.neo4j.test.DoubleLatch.awaitLatch; public class LazySingleReferenceTest diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/MovingAverageTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/MovingAverageTest.java index ce3fdd8761e68..c5d3f3fac41c2 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/MovingAverageTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/MovingAverageTest.java @@ -20,6 +20,7 @@ package org.neo4j.kernel.impl.util; import org.junit.Test; + import static org.hamcrest.Matchers.greaterThan; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/TestArrayMap.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/TestArrayMap.java index ff5f74d214a89..35303ec7819a4 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/TestArrayMap.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/TestArrayMap.java @@ -19,9 +19,8 @@ */ package org.neo4j.kernel.impl.util; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import org.junit.Ignore; +import org.junit.Test; import java.lang.reflect.Field; import java.util.ArrayList; @@ -29,8 +28,9 @@ import java.util.Map; import java.util.concurrent.CountDownLatch; -import org.junit.Ignore; -import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; public class TestArrayMap { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/TestBits.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/TestBits.java index 461b0e3b9da5e..bb3faef9c006a 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/TestBits.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/TestBits.java @@ -19,14 +19,14 @@ */ package org.neo4j.kernel.impl.util; +import org.junit.Test; + import java.nio.ByteBuffer; import java.nio.ByteOrder; -import org.junit.Test; import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; - import static org.neo4j.kernel.impl.util.Bits.bits; public class TestBits diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/TestBufferedFileChannel.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/TestBufferedFileChannel.java index 42b6059f84f71..9a4ff32e4dabc 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/TestBufferedFileChannel.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/TestBufferedFileChannel.java @@ -19,6 +19,8 @@ */ package org.neo4j.kernel.impl.util; +import org.junit.Test; + import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; @@ -26,12 +28,10 @@ import java.nio.ByteBuffer; import java.nio.channels.FileChannel; -import org.junit.Test; -import org.neo4j.kernel.monitoring.ByteCounterMonitor; -import org.neo4j.kernel.monitoring.Monitors; - import org.neo4j.io.fs.StoreChannel; import org.neo4j.io.fs.StoreFileChannel; +import org.neo4j.kernel.monitoring.ByteCounterMonitor; +import org.neo4j.kernel.monitoring.Monitors; import static org.junit.Assert.assertEquals; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/TestCopyOnWriteHashMap.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/TestCopyOnWriteHashMap.java index 2c254ee546476..4a0f60010c8d4 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/TestCopyOnWriteHashMap.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/TestCopyOnWriteHashMap.java @@ -19,13 +19,13 @@ */ package org.neo4j.kernel.impl.util; -import static org.neo4j.kernel.impl.traversal.TraversalTestBase.assertContains; +import org.junit.Test; import java.util.Iterator; import java.util.Map; import java.util.Map.Entry; -import org.junit.Test; +import static org.neo4j.kernel.impl.traversal.TraversalTestBase.assertContains; public class TestCopyOnWriteHashMap { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/ValidatorsTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/ValidatorsTest.java index d29ca45ff2382..4d2ad2577c641 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/ValidatorsTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/ValidatorsTest.java @@ -24,10 +24,8 @@ import java.io.IOException; -import org.neo4j.test.rule.TargetDirectory; -import org.neo4j.test.rule.TargetDirectory.TestDirectory; +import org.neo4j.test.rule.TestDirectory; -import static junit.framework.TestCase.assertTrue; import static org.hamcrest.Matchers.containsString; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; @@ -35,7 +33,7 @@ public class ValidatorsTest { @Rule - public final TestDirectory directory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory directory = TestDirectory.testDirectory(); @Test public void shouldFindFilesByRegex() throws Exception diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/VersionedHashMapTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/VersionedHashMapTest.java index 02eec6f8e8a7f..80f2993721f91 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/VersionedHashMapTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/VersionedHashMapTest.java @@ -19,13 +19,13 @@ */ package org.neo4j.kernel.impl.util; +import org.junit.Test; + import java.util.Iterator; import java.util.Map; -import org.junit.Test; - import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.*; +import static org.junit.Assert.assertThat; public class VersionedHashMapTest { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/collection/ArrayCollectionTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/collection/ArrayCollectionTest.java index 4d235a991ac10..c30c4528984bc 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/collection/ArrayCollectionTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/collection/ArrayCollectionTest.java @@ -19,11 +19,12 @@ */ package org.neo4j.kernel.impl.util.collection; +import org.junit.Test; + import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; -import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/collection/SimpleBitSetTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/collection/SimpleBitSetTest.java index 2449f07299c60..2bb46450c7131 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/collection/SimpleBitSetTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/collection/SimpleBitSetTest.java @@ -19,12 +19,12 @@ */ package org.neo4j.kernel.impl.util.collection; +import org.junit.Test; + import java.util.List; import org.neo4j.collection.primitive.PrimitiveIntCollections; -import org.junit.Test; - import static java.util.Arrays.asList; import static junit.framework.Assert.assertTrue; import static junit.framework.TestCase.assertFalse; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/internal/DatabaseHealthTest.java b/community/kernel/src/test/java/org/neo4j/kernel/internal/DatabaseHealthTest.java index f868ddcd04fe5..28fd05f2ffe61 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/internal/DatabaseHealthTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/internal/DatabaseHealthTest.java @@ -30,7 +30,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; - import static org.neo4j.graphdb.event.ErrorState.TX_MANAGER_NOT_OK; import static org.neo4j.logging.AssertableLogProvider.inLog; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/internal/StoreLockerLifecycleAdapterTest.java b/community/kernel/src/test/java/org/neo4j/kernel/internal/StoreLockerLifecycleAdapterTest.java index 6e1410993773f..1d744ac436d5a 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/internal/StoreLockerLifecycleAdapterTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/internal/StoreLockerLifecycleAdapterTest.java @@ -30,8 +30,7 @@ import org.neo4j.kernel.StoreLockException; import org.neo4j.kernel.configuration.Settings; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.TargetDirectory; -import org.neo4j.test.rule.TargetDirectory.TestDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.hamcrest.core.IsInstanceOf.instanceOf; import static org.junit.Assert.assertThat; @@ -41,7 +40,7 @@ public class StoreLockerLifecycleAdapterTest { @Rule - public final TestDirectory directory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory directory = TestDirectory.testDirectory(); @Test public void shouldAllowDatabasesToUseFilesetsSequentially() throws Exception diff --git a/community/kernel/src/test/java/org/neo4j/kernel/internal/StoreLockerTest.java b/community/kernel/src/test/java/org/neo4j/kernel/internal/StoreLockerTest.java index acb5b6e2d9516..7d7fade9621c3 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/internal/StoreLockerTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/internal/StoreLockerTest.java @@ -35,7 +35,7 @@ import org.neo4j.io.fs.StoreChannel; import org.neo4j.kernel.StoreLockException; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static java.lang.String.format; import static org.hamcrest.CoreMatchers.containsString; @@ -47,7 +47,7 @@ public class StoreLockerTest { @Rule - public TargetDirectory.TestDirectory target = TargetDirectory.testDirForTest( StoreLockerTest.class ); + public TestDirectory target = TestDirectory.testDirectory(); @Test public void shouldObtainLockWhenStoreFileNotLocked() throws Exception diff --git a/community/kernel/src/test/java/org/neo4j/kernel/recovery/LatestCheckPointFinderTest.java b/community/kernel/src/test/java/org/neo4j/kernel/recovery/LatestCheckPointFinderTest.java index 4e0a173a4234c..2c76f9ff626cd 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/recovery/LatestCheckPointFinderTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/recovery/LatestCheckPointFinderTest.java @@ -19,13 +19,13 @@ */ package org.neo4j.kernel.recovery; +import org.junit.Before; +import org.junit.Test; + import java.io.File; import java.io.IOException; import java.nio.ByteBuffer; -import org.junit.Before; -import org.junit.Test; - import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.fs.StoreChannel; import org.neo4j.kernel.impl.transaction.log.LogPosition; @@ -42,7 +42,6 @@ import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; - import static org.neo4j.kernel.impl.transaction.log.entry.LogHeader.LOG_HEADER_SIZE; import static org.neo4j.kernel.impl.transaction.log.entry.LogHeaderWriter.encodeLogVersion; diff --git a/community/kernel/src/test/java/org/neo4j/metatest/AsciiDocGeneratorTest.java b/community/kernel/src/test/java/org/neo4j/metatest/AsciiDocGeneratorTest.java index 8f9466c6ef39c..1ee1084168d5e 100644 --- a/community/kernel/src/test/java/org/neo4j/metatest/AsciiDocGeneratorTest.java +++ b/community/kernel/src/test/java/org/neo4j/metatest/AsciiDocGeneratorTest.java @@ -27,7 +27,7 @@ import java.io.IOException; import org.neo4j.test.AsciiDocGenerator; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -35,7 +35,7 @@ public class AsciiDocGeneratorTest { @Rule - public TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory testDirectory = TestDirectory.testDirectory( getClass() ); private File sectionDirectory; diff --git a/community/kernel/src/test/java/org/neo4j/metatest/BatchTransactionTest.java b/community/kernel/src/test/java/org/neo4j/metatest/BatchTransactionTest.java index e2fe6dc584ea8..21b52d07ef792 100644 --- a/community/kernel/src/test/java/org/neo4j/metatest/BatchTransactionTest.java +++ b/community/kernel/src/test/java/org/neo4j/metatest/BatchTransactionTest.java @@ -30,7 +30,6 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; - import static org.neo4j.test.BatchTransaction.beginBatchTx; public class BatchTransactionTest diff --git a/community/kernel/src/test/java/org/neo4j/metatest/TestJavaTestDocsGenerator.java b/community/kernel/src/test/java/org/neo4j/metatest/TestJavaTestDocsGenerator.java index 89e8272c2f4a0..4540e4c5e506f 100644 --- a/community/kernel/src/test/java/org/neo4j/metatest/TestJavaTestDocsGenerator.java +++ b/community/kernel/src/test/java/org/neo4j/metatest/TestJavaTestDocsGenerator.java @@ -39,7 +39,7 @@ import org.neo4j.test.JavaTestDocsGenerator; import org.neo4j.test.TestData; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -52,7 +52,7 @@ public class TestJavaTestDocsGenerator implements GraphHolder @Rule public TestData gen = TestData.producedThrough( JavaTestDocsGenerator.PRODUCER ); @Rule - public TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory testDirectory = TestDirectory.testDirectory(); private final String sectionName = "testsection"; private File directory; diff --git a/community/kernel/src/test/java/org/neo4j/test/InputStreamAwaiterTest.java b/community/kernel/src/test/java/org/neo4j/test/InputStreamAwaiterTest.java index 4e447c2532e13..376b79cccca7e 100644 --- a/community/kernel/src/test/java/org/neo4j/test/InputStreamAwaiterTest.java +++ b/community/kernel/src/test/java/org/neo4j/test/InputStreamAwaiterTest.java @@ -19,13 +19,13 @@ */ package org.neo4j.test; +import org.junit.Test; + import java.io.IOException; import java.io.InputStream; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.junit.Test; - import org.neo4j.helpers.FakeClock; import static org.junit.Assert.fail; diff --git a/community/kernel/src/test/java/org/neo4j/test/OnDemandJobScheduler.java b/community/kernel/src/test/java/org/neo4j/test/OnDemandJobScheduler.java index 71637de814249..7fa8a225e3548 100644 --- a/community/kernel/src/test/java/org/neo4j/test/OnDemandJobScheduler.java +++ b/community/kernel/src/test/java/org/neo4j/test/OnDemandJobScheduler.java @@ -28,7 +28,7 @@ import org.neo4j.kernel.impl.util.JobScheduler; import org.neo4j.kernel.lifecycle.LifecycleAdapter; -import static org.neo4j.kernel.impl.util.JobScheduler.Group.*; +import static org.neo4j.kernel.impl.util.JobScheduler.Group.NO_METADATA; public class OnDemandJobScheduler extends LifecycleAdapter implements JobScheduler { diff --git a/community/kernel/src/test/java/org/neo4j/test/TestData.java b/community/kernel/src/test/java/org/neo4j/test/TestData.java index 582765f2af863..762a0b55403c4 100644 --- a/community/kernel/src/test/java/org/neo4j/test/TestData.java +++ b/community/kernel/src/test/java/org/neo4j/test/TestData.java @@ -19,6 +19,12 @@ */ package org.neo4j.test; +import org.junit.Ignore; +import org.junit.rules.TestRule; +import org.junit.runner.Description; +import org.junit.runners.model.MultipleFailureException; +import org.junit.runners.model.Statement; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -26,12 +32,6 @@ import java.util.ArrayList; import java.util.List; -import org.junit.Ignore; -import org.junit.rules.TestRule; -import org.junit.runner.Description; -import org.junit.runners.model.MultipleFailureException; -import org.junit.runners.model.Statement; - import org.neo4j.kernel.impl.annotations.Documented; @Ignore( "this is not a test, it is a testing utility" ) diff --git a/community/kernel/src/test/java/org/neo4j/test/rule/EmbeddedDatabaseRule.java b/community/kernel/src/test/java/org/neo4j/test/rule/EmbeddedDatabaseRule.java index 73e7be8b0cc17..e4398c36886d7 100644 --- a/community/kernel/src/test/java/org/neo4j/test/rule/EmbeddedDatabaseRule.java +++ b/community/kernel/src/test/java/org/neo4j/test/rule/EmbeddedDatabaseRule.java @@ -73,7 +73,7 @@ public EmbeddedDatabaseRule( final Class testClass ) { this.temp = new TempDirectory() { - private final TargetDirectory targetDirectory = new TargetDirectory( new DefaultFileSystemAbstraction(), testClass ); + private final TestDirectory testDirectory = TestDirectory.testDirectory( testClass, new DefaultFileSystemAbstraction() ); private File dbDir; @Override @@ -85,13 +85,13 @@ public File root() @Override public void delete() throws IOException { - targetDirectory.cleanup(); + testDirectory.cleanup(); } @Override public void create() { - dbDir = targetDirectory.makeGraphDbDir(); + dbDir = testDirectory.makeGraphDbDir(); } }; } diff --git a/community/kernel/src/test/java/org/neo4j/test/rule/NeoStoresRule.java b/community/kernel/src/test/java/org/neo4j/test/rule/NeoStoresRule.java index 9045a9dec2565..b5eddcbd948b3 100644 --- a/community/kernel/src/test/java/org/neo4j/test/rule/NeoStoresRule.java +++ b/community/kernel/src/test/java/org/neo4j/test/rule/NeoStoresRule.java @@ -76,8 +76,8 @@ public NeoStores open( RecordFormats format, String... config ) public NeoStores open( FileSystemAbstraction fs, PageCache pageCache, RecordFormats format, String... config ) { assert neoStores == null : "Already opened"; - TargetDirectory targetDirectory = new TargetDirectory( fs, testClass ); - File storeDir = targetDirectory.makeGraphDbDir(); + TestDirectory testDirectory = TestDirectory.testDirectory( testClass, fs ); + File storeDir = testDirectory.makeGraphDbDir(); Config configuration = new Config( stringMap( config ) ); StoreFactory storeFactory = new StoreFactory( storeDir, configuration, new DefaultIdGeneratorFactory( fs ), pageCache, fs, format, NullLogProvider.getInstance() ); diff --git a/community/kernel/src/test/java/org/neo4j/test/rule/dump/DumpProcessInformationTest.java b/community/kernel/src/test/java/org/neo4j/test/rule/dump/DumpProcessInformationTest.java index 3ebe719b00146..8c8c93fd4ccc7 100644 --- a/community/kernel/src/test/java/org/neo4j/test/rule/dump/DumpProcessInformationTest.java +++ b/community/kernel/src/test/java/org/neo4j/test/rule/dump/DumpProcessInformationTest.java @@ -36,7 +36,7 @@ import org.neo4j.helpers.collection.Pair; import org.neo4j.io.proc.ProcessUtil; import org.neo4j.logging.NullLogProvider; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static java.lang.Runtime.getRuntime; import static org.hamcrest.Matchers.containsString; @@ -51,7 +51,7 @@ public class DumpProcessInformationTest private static final String SIGNAL = "here"; @Rule - public final TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory testDirectory = TestDirectory.testDirectory(); @Test public void shouldDumpProcessInformation() throws Exception diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/batchinsert/BatchInsertTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/batchinsert/BatchInsertTest.java index 70c659545bb09..6e97ac96f20fb 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/batchinsert/BatchInsertTest.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/batchinsert/BatchInsertTest.java @@ -98,7 +98,7 @@ import org.neo4j.storageengine.api.schema.SchemaRule; import org.neo4j.test.TestGraphDatabaseFactory; import org.neo4j.test.rule.PageCacheRule; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static java.lang.Integer.parseInt; import static java.util.Collections.singletonList; @@ -191,7 +191,7 @@ private enum RelTypes implements RelationshipType private final FileSystemAbstraction fs = new org.neo4j.io.fs.DefaultFileSystemAbstraction(); @Rule - public TargetDirectory.TestDirectory storeDir = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory storeDir = TestDirectory.testDirectory(); @Rule public final PageCacheRule pageCacheRule = new PageCacheRule(); diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/batchinsert/internal/BatchInserterImplTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/batchinsert/internal/BatchInserterImplTest.java index ced02b76d21c4..5dbe32d953699 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/batchinsert/internal/BatchInserterImplTest.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/batchinsert/internal/BatchInserterImplTest.java @@ -32,7 +32,7 @@ import org.neo4j.kernel.impl.store.NeoStores; import org.neo4j.kernel.internal.StoreLocker; import org.neo4j.test.ReflectionUtil; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import org.neo4j.unsafe.batchinsert.BatchInserter; import org.neo4j.unsafe.batchinsert.BatchInserters; @@ -45,7 +45,7 @@ public class BatchInserterImplTest { @Rule - public TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory testDirectory = TestDirectory.testDirectory(); @Test public void testHonorsPassedInParams() throws Exception diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/RelationshipGroupCacheTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/RelationshipGroupCacheTest.java index 4da1975c3b092..8b53ba584e3a9 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/RelationshipGroupCacheTest.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/RelationshipGroupCacheTest.java @@ -29,7 +29,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; - import static org.neo4j.unsafe.impl.batchimport.cache.NumberArrayFactory.HEAP; public class RelationshipGroupCacheTest diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/RelationshipGroupDefragmenterTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/RelationshipGroupDefragmenterTest.java index b86e270c417bc..4c7c40a2295e0 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/RelationshipGroupDefragmenterTest.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/RelationshipGroupDefragmenterTest.java @@ -44,15 +44,13 @@ import org.neo4j.kernel.impl.store.record.Record; import org.neo4j.kernel.impl.store.record.RelationshipGroupRecord; import org.neo4j.test.rule.RandomRule; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import org.neo4j.unsafe.impl.batchimport.staging.ExecutionMonitors; import org.neo4j.unsafe.impl.batchimport.store.BatchingNeoStores; +import static java.util.Arrays.asList; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; - -import static java.util.Arrays.asList; - import static org.neo4j.io.ByteUnit.mebiBytes; import static org.neo4j.kernel.impl.store.record.RecordLoad.CHECK; @@ -70,7 +68,7 @@ public static Collection formats() } @Rule - public final TargetDirectory.TestDirectory directory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory directory = TestDirectory.testDirectory(); @Rule public final RandomRule random = new RandomRule(); diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/RelationshipTypeCheckerStepTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/RelationshipTypeCheckerStepTest.java index f50e8e9e58b27..67cc1be6dbc5d 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/RelationshipTypeCheckerStepTest.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/RelationshipTypeCheckerStepTest.java @@ -35,12 +35,10 @@ import org.neo4j.unsafe.impl.batchimport.staging.StageControl; import org.neo4j.unsafe.impl.batchimport.store.BatchingTokenRepository.BatchingRelationshipTypeTokenRepository; +import static java.util.Arrays.asList; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.mock; - -import static java.util.Arrays.asList; - import static org.neo4j.helpers.collection.Iterators.loop; import static org.neo4j.unsafe.impl.batchimport.Configuration.DEFAULT; import static org.neo4j.unsafe.impl.batchimport.input.Group.GLOBAL; diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/cache/IntArrayTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/cache/IntArrayTest.java index 47325fb2274b6..960428a5abc63 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/cache/IntArrayTest.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/cache/IntArrayTest.java @@ -19,18 +19,17 @@ */ package org.neo4j.unsafe.impl.batchimport.cache; -import java.util.Arrays; -import java.util.Collection; -import java.util.Random; - import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -import static java.lang.System.currentTimeMillis; +import java.util.Arrays; +import java.util.Collection; +import java.util.Random; +import static java.lang.System.currentTimeMillis; import static org.junit.Assert.assertEquals; @RunWith( Parameterized.class ) diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/cache/LongArrayTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/cache/LongArrayTest.java index 01a4ea4e96300..2169664df304c 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/cache/LongArrayTest.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/cache/LongArrayTest.java @@ -19,18 +19,17 @@ */ package org.neo4j.unsafe.impl.batchimport.cache; -import java.util.Arrays; -import java.util.Collection; -import java.util.Random; - import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -import static java.lang.System.currentTimeMillis; +import java.util.Arrays; +import java.util.Collection; +import java.util.Random; +import static java.lang.System.currentTimeMillis; import static org.junit.Assert.assertEquals; @RunWith( Parameterized.class ) diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/cache/LongBitsManipulatorTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/cache/LongBitsManipulatorTest.java index ddc8223d041a3..9f6b47ac85cc3 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/cache/LongBitsManipulatorTest.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/cache/LongBitsManipulatorTest.java @@ -20,6 +20,7 @@ package org.neo4j.unsafe.impl.batchimport.cache; import org.junit.Test; + import static org.junit.Assert.assertEquals; public class LongBitsManipulatorTest diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/cache/NodeRelationshipCacheTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/cache/NodeRelationshipCacheTest.java index db76f3877b1af..7be7f730e1a2b 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/cache/NodeRelationshipCacheTest.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/cache/NodeRelationshipCacheTest.java @@ -24,9 +24,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; + import org.neo4j.collection.primitive.Primitive; import org.neo4j.collection.primitive.PrimitiveLongObjectMap; import org.neo4j.collection.primitive.PrimitiveLongSet; @@ -35,6 +37,7 @@ import org.neo4j.unsafe.impl.batchimport.cache.NodeRelationshipCache.GroupVisitor; import org.neo4j.unsafe.impl.batchimport.cache.NodeRelationshipCache.NodeChangeVisitor; +import static java.lang.Math.max; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -43,9 +46,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; - -import static java.lang.Math.max; - import static org.neo4j.graphdb.Direction.BOTH; import static org.neo4j.graphdb.Direction.INCOMING; import static org.neo4j.graphdb.Direction.OUTGOING; diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/cache/idmapping/IdGeneratorsTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/cache/idmapping/IdGeneratorsTest.java index 653377b18cd2c..f20b6d00cdd7a 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/cache/idmapping/IdGeneratorsTest.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/cache/idmapping/IdGeneratorsTest.java @@ -19,12 +19,13 @@ */ package org.neo4j.unsafe.impl.batchimport.cache.idmapping; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertTrue; - import org.junit.Test; + import org.neo4j.kernel.impl.store.id.IdGeneratorImpl; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertTrue; + public class IdGeneratorsTest { @Test diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/cache/idmapping/string/SourceInformationTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/cache/idmapping/string/SourceInformationTest.java index b39f80d351dc4..59a6a6437d312 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/cache/idmapping/string/SourceInformationTest.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/cache/idmapping/string/SourceInformationTest.java @@ -24,10 +24,9 @@ import java.util.Random; import java.util.concurrent.ThreadLocalRandom; -import static org.junit.Assert.assertEquals; - import static java.lang.Math.abs; import static java.lang.String.format; +import static org.junit.Assert.assertEquals; public class SourceInformationTest { diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/executor/DynamicTaskExecutorTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/executor/DynamicTaskExecutorTest.java index b9bd26df00928..7509b6755eaed 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/executor/DynamicTaskExecutorTest.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/executor/DynamicTaskExecutorTest.java @@ -24,6 +24,7 @@ import java.io.IOException; import java.util.concurrent.Future; + import org.neo4j.helpers.Exceptions; import org.neo4j.test.Barrier; import org.neo4j.test.DoubleLatch; @@ -34,14 +35,12 @@ import org.neo4j.test.RepeatRule.Repeat; import org.neo4j.unsafe.impl.batchimport.executor.ParkStrategy.Park; +import static java.util.concurrent.TimeUnit.MILLISECONDS; +import static java.util.concurrent.TimeUnit.SECONDS; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; - -import static java.util.concurrent.TimeUnit.MILLISECONDS; -import static java.util.concurrent.TimeUnit.SECONDS; - import static org.neo4j.unsafe.impl.batchimport.executor.TaskExecutor.SF_ABORT_QUEUED; import static org.neo4j.unsafe.impl.batchimport.executor.TaskExecutor.SF_AWAIT_ALL_COMPLETED; diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/input/InputCacheTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/input/InputCacheTest.java index cde853fd5faed..bdb37ed9d2855 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/input/InputCacheTest.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/input/InputCacheTest.java @@ -33,8 +33,7 @@ import org.neo4j.kernel.impl.store.format.standard.StandardV3_0; import org.neo4j.test.Randoms; import org.neo4j.test.rule.RandomRule; -import org.neo4j.test.rule.TargetDirectory; -import org.neo4j.test.rule.TargetDirectory.TestDirectory; +import org.neo4j.test.rule.TestDirectory; import org.neo4j.test.rule.fs.DefaultFileSystemRule; import org.neo4j.unsafe.impl.batchimport.Configuration; import org.neo4j.unsafe.impl.batchimport.Configuration.Default; @@ -42,12 +41,10 @@ import static java.lang.Math.abs; import static java.lang.System.currentTimeMillis; - import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; - import static org.neo4j.helpers.Format.duration; import static org.neo4j.helpers.collection.Iterators.asSet; import static org.neo4j.helpers.collection.Iterators.count; @@ -62,7 +59,7 @@ public class InputCacheTest private static final String[] TOKENS = new String[] { "One", "Two", "Three", "Four", "Five", "Six", "Seven" }; private final DefaultFileSystemRule fileSystemRule = new DefaultFileSystemRule(); - private final TestDirectory dir = TargetDirectory.testDirForTest( getClass() ); + private final TestDirectory dir = TestDirectory.testDirectory(); private final RandomRule randomRule = new RandomRule(); @Rule diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/input/InputEntityTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/input/InputEntityTest.java index 2124f5cd9b87f..da105563dd0cb 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/input/InputEntityTest.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/input/InputEntityTest.java @@ -22,7 +22,6 @@ import org.junit.Test; import static org.junit.Assert.assertArrayEquals; - import static org.neo4j.unsafe.impl.batchimport.input.UpdateBehaviour.ADD; public class InputEntityTest diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/input/PerTypeRelationshipSplitterTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/input/PerTypeRelationshipSplitterTest.java index 841e6eb726f2e..c8af995d74f3a 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/input/PerTypeRelationshipSplitterTest.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/input/PerTypeRelationshipSplitterTest.java @@ -31,7 +31,7 @@ import org.neo4j.io.fs.DefaultFileSystemAbstraction; import org.neo4j.kernel.impl.store.format.standard.StandardV3_0; import org.neo4j.test.rule.RandomRule; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import org.neo4j.unsafe.impl.batchimport.Configuration; import org.neo4j.unsafe.impl.batchimport.InputIterable; import org.neo4j.unsafe.impl.batchimport.InputIterator; @@ -46,7 +46,7 @@ public class PerTypeRelationshipSplitterTest @Rule public final RandomRule random = new RandomRule().withSeed( 1460373085111L ); @Rule - public final TargetDirectory.TestDirectory directory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory directory = TestDirectory.testDirectory(); @Test public void shouldReturnTypesOneByOne() throws Exception diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/input/csv/CsvInputBatchImportIT.java b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/input/csv/CsvInputBatchImportIT.java index 96092a3a51bd8..0c83c56791174 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/input/csv/CsvInputBatchImportIT.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/input/csv/CsvInputBatchImportIT.java @@ -57,8 +57,7 @@ import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.storageengine.api.Token; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.TargetDirectory; -import org.neo4j.test.rule.TargetDirectory.TestDirectory; +import org.neo4j.test.rule.TestDirectory; import org.neo4j.unsafe.impl.batchimport.BatchImporter; import org.neo4j.unsafe.impl.batchimport.Configuration; import org.neo4j.unsafe.impl.batchimport.Configuration.Default; @@ -488,7 +487,7 @@ private String nameOf( InputNode node ) private final FileSystemAbstraction fs = new DefaultFileSystemAbstraction(); @Rule - public final TestDirectory directory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory directory = TestDirectory.testDirectory(); private final long seed = currentTimeMillis(); private final Random random = new Random( seed ); } diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/input/csv/CsvInputTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/input/csv/CsvInputTest.java index 120261096501d..292af7b44d252 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/input/csv/CsvInputTest.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/input/csv/CsvInputTest.java @@ -35,8 +35,7 @@ import org.neo4j.csv.reader.Extractors; import org.neo4j.graphdb.ResourceIterator; import org.neo4j.helpers.collection.Iterables; -import org.neo4j.test.rule.TargetDirectory; -import org.neo4j.test.rule.TargetDirectory.TestDirectory; +import org.neo4j.test.rule.TestDirectory; import org.neo4j.unsafe.impl.batchimport.InputIterator; import org.neo4j.unsafe.impl.batchimport.input.Collector; import org.neo4j.unsafe.impl.batchimport.input.DataException; @@ -989,6 +988,6 @@ public InputNode apply( InputNode from ) throws RuntimeException } @Rule - public final TestDirectory directory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory directory = TestDirectory.testDirectory(); private final Extractors extractors = new Extractors( ',' ); } diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/input/csv/DataFactoriesTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/input/csv/DataFactoriesTest.java index c18da6f4aadac..55e6f4ffd7060 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/input/csv/DataFactoriesTest.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/input/csv/DataFactoriesTest.java @@ -19,12 +19,12 @@ */ package org.neo4j.unsafe.impl.batchimport.input.csv; +import org.junit.Test; + import java.io.IOException; import java.io.Reader; import java.io.StringReader; -import org.junit.Test; - import org.neo4j.csv.reader.CharSeeker; import org.neo4j.csv.reader.CharSeekers; import org.neo4j.csv.reader.Extractor; @@ -38,7 +38,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; - import static org.neo4j.csv.reader.Readables.sources; import static org.neo4j.csv.reader.Readables.wrap; import static org.neo4j.helpers.ArrayUtil.array; diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/staging/ControlledStep.java b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/staging/ControlledStep.java index 8928ade4781e1..496376e01c3fb 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/staging/ControlledStep.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/staging/ControlledStep.java @@ -31,10 +31,9 @@ import org.neo4j.unsafe.impl.batchimport.stats.StatsProvider; import org.neo4j.unsafe.impl.batchimport.stats.StepStats; -import static org.junit.Assert.assertTrue; - import static java.lang.Integer.max; import static java.lang.Integer.min; +import static org.junit.Assert.assertTrue; /** * A bit like a mocked {@link Step}, but easier to work with. diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/staging/DynamicProcessorAssignerTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/staging/DynamicProcessorAssignerTest.java index 4fd09d0dc0736..e6568f5425ac9 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/staging/DynamicProcessorAssignerTest.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/staging/DynamicProcessorAssignerTest.java @@ -29,7 +29,6 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; - import static org.neo4j.unsafe.impl.batchimport.staging.ControlledStep.stepWithStats; import static org.neo4j.unsafe.impl.batchimport.staging.Step.ORDER_SEND_DOWNSTREAM; import static org.neo4j.unsafe.impl.batchimport.stats.Keys.avg_processing_time; diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/staging/QuantizedProjectionTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/staging/QuantizedProjectionTest.java index 96ed80dc2fb59..e99901c56e6c1 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/staging/QuantizedProjectionTest.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/staging/QuantizedProjectionTest.java @@ -20,6 +20,7 @@ package org.neo4j.unsafe.impl.batchimport.staging; import org.junit.Test; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/staging/ReadRecordsStepTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/staging/ReadRecordsStepTest.java index a4387536086c4..1d98fbbf1d955 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/staging/ReadRecordsStepTest.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/staging/ReadRecordsStepTest.java @@ -34,7 +34,6 @@ import static org.junit.Assert.assertNotNull; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; - import static org.neo4j.unsafe.impl.batchimport.Configuration.DEFAULT; import static org.neo4j.unsafe.impl.batchimport.RecordIdIteration.allIn; diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/staging/SpectrumExecutionMonitorTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/staging/SpectrumExecutionMonitorTest.java index fd63dd07600f8..8faee65dcc804 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/staging/SpectrumExecutionMonitorTest.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/staging/SpectrumExecutionMonitorTest.java @@ -26,12 +26,13 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; + import org.neo4j.unsafe.impl.batchimport.stats.Keys; +import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static java.util.concurrent.TimeUnit.MILLISECONDS; public class SpectrumExecutionMonitorTest { diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/staging/StageExecutionTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/staging/StageExecutionTest.java index b1c7467615c2b..4550cdae282d4 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/staging/StageExecutionTest.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/staging/StageExecutionTest.java @@ -30,7 +30,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; - import static org.neo4j.unsafe.impl.batchimport.Configuration.DEFAULT; import static org.neo4j.unsafe.impl.batchimport.staging.ControlledStep.stepWithAverageOf; import static org.neo4j.unsafe.impl.batchimport.staging.Step.ORDER_SEND_DOWNSTREAM; diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/staging/StageTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/staging/StageTest.java index ff3682727b91d..970bc0233e608 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/staging/StageTest.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/staging/StageTest.java @@ -27,7 +27,6 @@ import org.neo4j.unsafe.impl.batchimport.stats.Keys; import static org.junit.Assert.assertEquals; - import static org.neo4j.unsafe.impl.batchimport.staging.Configuration.DEFAULT; import static org.neo4j.unsafe.impl.batchimport.staging.Step.ORDER_SEND_DOWNSTREAM; diff --git a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/IndexCreationTest.java b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/IndexCreationTest.java index 0da7b96d47514..d7a2e21f48af8 100644 --- a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/IndexCreationTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/IndexCreationTest.java @@ -54,7 +54,7 @@ import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.storageengine.api.StorageCommand; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static java.util.concurrent.Executors.newCachedThreadPool; import static org.junit.Assert.assertEquals; @@ -71,7 +71,7 @@ public class IndexCreationTest { @Rule - public final TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory testDirectory = TestDirectory.testDirectory(); private GraphDatabaseAPI db; diff --git a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/LuceneDataSourceTest.java b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/LuceneDataSourceTest.java index 6d78563edc925..4c6ff2c2b34f9 100644 --- a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/LuceneDataSourceTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/LuceneDataSourceTest.java @@ -38,8 +38,7 @@ import org.neo4j.kernel.impl.index.IndexConfigStore; import org.neo4j.kernel.impl.index.IndexEntityType; import org.neo4j.kernel.lifecycle.LifeRule; -import org.neo4j.test.rule.TargetDirectory; -import org.neo4j.test.rule.TargetDirectory.TestDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -50,7 +49,7 @@ public class LuceneDataSourceTest { private final LifeRule life = new LifeRule( true ); - private final TestDirectory directory = TargetDirectory.testDirForTest( getClass() ); + private final TestDirectory directory = TestDirectory.testDirectory(); private final ExpectedException expectedException = ExpectedException.none(); @Rule diff --git a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/NonUniqueIndexTests.java b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/NonUniqueIndexTests.java index 443f2afab8cbb..2f9539b6520d5 100644 --- a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/NonUniqueIndexTests.java +++ b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/NonUniqueIndexTests.java @@ -52,7 +52,7 @@ import org.neo4j.kernel.impl.util.Neo4jJobScheduler; import org.neo4j.logging.LogProvider; import org.neo4j.storageengine.api.schema.IndexReader; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static java.util.Collections.singletonList; import static org.hamcrest.CoreMatchers.equalTo; @@ -63,7 +63,7 @@ public class NonUniqueIndexTests { @Rule - public final TargetDirectory.TestDirectory directory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory directory = TestDirectory.testDirectory( getClass() ); @Test public void concurrentIndexPopulationAndInsertsShouldNotProduceDuplicates() throws IOException diff --git a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/ReadOnlyIndexReferenceFactoryTest.java b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/ReadOnlyIndexReferenceFactoryTest.java index d0470385de390..ecaf1795398c1 100644 --- a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/ReadOnlyIndexReferenceFactoryTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/ReadOnlyIndexReferenceFactoryTest.java @@ -36,13 +36,13 @@ import org.neo4j.kernel.impl.index.IndexConfigStore; import org.neo4j.kernel.impl.index.IndexEntityType; import org.neo4j.test.rule.CleanupRule; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertSame; public class ReadOnlyIndexReferenceFactoryTest { - private TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + private TestDirectory testDirectory = TestDirectory.testDirectory(); private ExpectedException expectedException = ExpectedException.none(); private CleanupRule cleanupRule = new CleanupRule(); diff --git a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/WritableIndexReferenceFactoryTest.java b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/WritableIndexReferenceFactoryTest.java index 87ebc0ca915a9..853ff7227fc03 100644 --- a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/WritableIndexReferenceFactoryTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/WritableIndexReferenceFactoryTest.java @@ -36,7 +36,7 @@ import org.neo4j.kernel.impl.index.IndexConfigStore; import org.neo4j.kernel.impl.index.IndexEntityType; import org.neo4j.test.rule.CleanupRule; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotSame; @@ -45,7 +45,7 @@ public class WritableIndexReferenceFactoryTest { @Rule - public TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory testDirectory = TestDirectory.testDirectory(); @Rule public CleanupRule cleanupRule = new CleanupRule(); diff --git a/community/lucene-index/src/test/java/org/neo4j/index/lucene/ConstraintIndexFailureIT.java b/community/lucene-index/src/test/java/org/neo4j/index/lucene/ConstraintIndexFailureIT.java index 7e05f01dbd621..5c7ee0d9535ed 100644 --- a/community/lucene-index/src/test/java/org/neo4j/index/lucene/ConstraintIndexFailureIT.java +++ b/community/lucene-index/src/test/java/org/neo4j/index/lucene/ConstraintIndexFailureIT.java @@ -32,19 +32,18 @@ import org.neo4j.kernel.api.impl.index.builder.LuceneIndexStorageBuilder; import org.neo4j.kernel.api.impl.index.storage.PartitionedIndexStorage; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.core.IsEqual.equalTo; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; import static org.neo4j.graphdb.Label.label; -import static org.neo4j.test.rule.TargetDirectory.testDirForTest; public class ConstraintIndexFailureIT { @Rule - public final TargetDirectory.TestDirectory storeDir = testDirForTest( ConstraintIndexFailureIT.class ); + public final TestDirectory storeDir = TestDirectory.testDirectory(); @Test public void shouldFailToValidateConstraintsIfUnderlyingIndexIsFailed() throws Exception diff --git a/community/lucene-index/src/test/java/org/neo4j/index/recovery/UniqueIndexRecoveryTests.java b/community/lucene-index/src/test/java/org/neo4j/index/recovery/UniqueIndexRecoveryTests.java index 30d9f6463a896..4152e8e13c429 100644 --- a/community/lucene-index/src/test/java/org/neo4j/index/recovery/UniqueIndexRecoveryTests.java +++ b/community/lucene-index/src/test/java/org/neo4j/index/recovery/UniqueIndexRecoveryTests.java @@ -50,7 +50,7 @@ import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.storageengine.api.StorageEngine; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static java.util.Arrays.asList; import static org.hamcrest.MatcherAssert.assertThat; @@ -65,8 +65,7 @@ public class UniqueIndexRecoveryTests { @Rule - public final TargetDirectory.TestDirectory storeDir = - TargetDirectory.testDirForTest( UniqueIndexRecoveryTests.class ); + public final TestDirectory storeDir = TestDirectory.testDirectory(); private static final String PROPERTY_KEY = "key"; private static final String PROPERTY_VALUE = "value"; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/DatabaseIndexIntegrationTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/DatabaseIndexIntegrationTest.java index a737d34cdb32f..ea6bf3d10deee 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/DatabaseIndexIntegrationTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/DatabaseIndexIntegrationTest.java @@ -54,17 +54,16 @@ import org.neo4j.kernel.api.impl.index.storage.DirectoryFactory; import org.neo4j.kernel.api.impl.index.storage.PartitionedIndexStorage; import org.neo4j.test.RepeatRule; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; public class DatabaseIndexIntegrationTest { private static final int THREAD_NUMBER = 5; @Rule - public TargetDirectory.TestDirectory testDir = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory testDir = TestDirectory.testDirectory(); @Rule public RepeatRule repeatRule = new RepeatRule(); diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndexPopulationIT.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndexPopulationIT.java index 0395f1abaee67..ed49dc3834c50 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndexPopulationIT.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndexPopulationIT.java @@ -41,7 +41,7 @@ import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.storageengine.api.schema.IndexSample; import org.neo4j.storageengine.api.schema.IndexSampler; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -52,7 +52,7 @@ public class LuceneSchemaIndexPopulationIT { @Rule - public TargetDirectory.TestDirectory testDir = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory testDir = TestDirectory.testDirectory(); private int affectedNodes; @Before diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndexUniquenessVerificationIT.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndexUniquenessVerificationIT.java index 88835f1f4f2e1..7b40e74cd231d 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndexUniquenessVerificationIT.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndexUniquenessVerificationIT.java @@ -52,7 +52,7 @@ import org.neo4j.kernel.api.index.PropertyAccessor; import org.neo4j.kernel.api.properties.Property; import org.neo4j.test.Randoms; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static java.util.stream.Collectors.toSet; import static org.hamcrest.Matchers.instanceOf; @@ -66,7 +66,7 @@ public class LuceneSchemaIndexUniquenessVerificationIT private static final int PROPERTY_KEY_ID = 42; @Rule - public TargetDirectory.TestDirectory testDir = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory testDir = TestDirectory.testDirectory(); @Parameter public int nodesToCreate; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/backup/ReadOnlyIndexSnapshotFileIteratorTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/backup/ReadOnlyIndexSnapshotFileIteratorTest.java index 3a99dc1fae5b1..8a0758bfba49e 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/backup/ReadOnlyIndexSnapshotFileIteratorTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/backup/ReadOnlyIndexSnapshotFileIteratorTest.java @@ -38,7 +38,7 @@ import org.neo4j.io.IOUtils; import org.neo4j.kernel.api.impl.index.IndexWriterConfigs; import org.neo4j.kernel.api.impl.index.storage.DirectoryFactory; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static java.util.stream.Collectors.toSet; import static junit.framework.TestCase.assertFalse; @@ -47,7 +47,7 @@ public class ReadOnlyIndexSnapshotFileIteratorTest { @Rule - public final TargetDirectory.TestDirectory testDir = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory testDir = TestDirectory.testDirectory(); protected File indexDir; protected Directory dir; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/partition/IndexPartitionFactoryTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/partition/IndexPartitionFactoryTest.java index aa5553e41d51b..60f5e87a81992 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/partition/IndexPartitionFactoryTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/partition/IndexPartitionFactoryTest.java @@ -32,7 +32,7 @@ import org.neo4j.kernel.api.impl.index.IndexWriterConfigs; import org.neo4j.kernel.api.impl.index.storage.DirectoryFactory; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertEquals; @@ -40,7 +40,7 @@ public class IndexPartitionFactoryTest { @Rule - public final TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory testDirectory = TestDirectory.testDirectory(); @Rule public ExpectedException expectedException = ExpectedException.none(); 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 c10d9c826f83d..6d6f8119ef2f4 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 @@ -43,7 +43,7 @@ import org.neo4j.io.fs.FileSystemAbstraction; 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.TestDirectory; import org.neo4j.test.rule.fs.DefaultFileSystemRule; import static org.junit.Assert.assertEquals; @@ -58,7 +58,7 @@ public class PartitionedIndexStorageTest @Rule public final DefaultFileSystemRule fsRule = new DefaultFileSystemRule(); @Rule - public final TargetDirectory.TestDirectory testDir = TargetDirectory.testDirForTest( getClass(), fsRule.get() ); + public final TestDirectory testDir = TestDirectory.testDirectory( getClass(), fsRule.get() ); private DefaultFileSystemAbstraction fs; private PartitionedIndexStorage storage; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/verification/SimpleUniquenessVerifierTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/verification/SimpleUniquenessVerifierTest.java index 9578835a17e2a..8fe5543ad8ffe 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/verification/SimpleUniquenessVerifierTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/verification/SimpleUniquenessVerifierTest.java @@ -46,7 +46,7 @@ import org.neo4j.kernel.api.impl.schema.verification.UniquenessVerifier; import org.neo4j.kernel.api.index.PreexistingIndexEntryConflictException; import org.neo4j.kernel.api.index.PropertyAccessor; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static java.util.Arrays.asList; import static org.hamcrest.Matchers.instanceOf; @@ -64,7 +64,7 @@ public class SimpleUniquenessVerifierTest private static final int PROPERTY_KEY_ID = 42; @Rule - public TargetDirectory.TestDirectory testDir = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory testDir = TestDirectory.testDirectory(); private DirectoryFactory dirFactory; private IndexWriter writer; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/labelscan/LuceneLabelScanIndexBuilderTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/labelscan/LuceneLabelScanIndexBuilderTest.java index 90136001b19a3..90bccd73e1104 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/labelscan/LuceneLabelScanIndexBuilderTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/labelscan/LuceneLabelScanIndexBuilderTest.java @@ -27,7 +27,7 @@ import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.configuration.Settings; import org.neo4j.kernel.impl.factory.OperationalMode; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -36,7 +36,7 @@ public class LuceneLabelScanIndexBuilderTest { @Rule - public final TargetDirectory.TestDirectory testDir = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory testDir = TestDirectory.testDirectory( getClass() ); @Test public void readOnlyIndexCreation() throws Exception diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/labelscan/LuceneLabelScanIndexIT.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/labelscan/LuceneLabelScanIndexIT.java index 130eb7cf6a8d4..ccd798f11a9dd 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/labelscan/LuceneLabelScanIndexIT.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/labelscan/LuceneLabelScanIndexIT.java @@ -34,7 +34,7 @@ import org.neo4j.kernel.api.labelscan.LabelScanWriter; import org.neo4j.kernel.api.labelscan.NodeLabelUpdate; import org.neo4j.storageengine.api.schema.LabelScanReader; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertEquals; @@ -43,7 +43,7 @@ public class LuceneLabelScanIndexIT { @Rule - public TargetDirectory.TestDirectory testDir = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory testDir = TestDirectory.testDirectory(); private int affectedNodes; @Before diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/labelscan/LuceneLabelScanStoreTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/labelscan/LuceneLabelScanStoreTest.java index f3d8fcdd116ed..cf320ef1af5df 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/labelscan/LuceneLabelScanStoreTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/labelscan/LuceneLabelScanStoreTest.java @@ -66,7 +66,7 @@ import org.neo4j.kernel.lifecycle.LifeSupport; import org.neo4j.logging.NullLogProvider; import org.neo4j.storageengine.api.schema.LabelScanReader; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static java.util.Arrays.asList; import static java.util.Collections.emptyList; @@ -88,7 +88,7 @@ public class LuceneLabelScanStoreTest { @Rule - public final TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory testDirectory = TestDirectory.testDirectory(); @Rule public ExpectedException expectedException = ExpectedException.none(); diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/labelscan/LuceneLabelScanStoreWriterTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/labelscan/LuceneLabelScanStoreWriterTest.java index 2d4646d2fd768..4adc6c7a186c2 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/labelscan/LuceneLabelScanStoreWriterTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/labelscan/LuceneLabelScanStoreWriterTest.java @@ -61,7 +61,7 @@ import org.neo4j.kernel.api.impl.labelscan.storestrategy.BitmapDocumentFormat; import org.neo4j.kernel.api.impl.labelscan.writer.PartitionedLuceneLabelScanWriter; import org.neo4j.kernel.api.labelscan.NodeLabelUpdate; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static java.lang.Long.parseLong; import static java.lang.String.valueOf; @@ -85,7 +85,7 @@ public class LuceneLabelScanStoreWriterTest public BitmapDocumentFormat format; @Rule - public final TargetDirectory.TestDirectory testDir = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory testDir = TestDirectory.testDirectory(); private final DirectoryFactory dirFactory = new DirectoryFactory.InMemoryDirectoryFactory(); @Parameterized.Parameters( name = "{0} bits" ) diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/labelscan/ReadOnlyLuceneLabelScanIndexTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/labelscan/ReadOnlyLuceneLabelScanIndexTest.java index 9ed08309bfecc..0044b710952f6 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/labelscan/ReadOnlyLuceneLabelScanIndexTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/labelscan/ReadOnlyLuceneLabelScanIndexTest.java @@ -31,14 +31,14 @@ import org.neo4j.kernel.api.impl.index.storage.DirectoryFactory; import org.neo4j.kernel.api.impl.index.storage.PartitionedIndexStorage; import org.neo4j.kernel.api.impl.labelscan.storestrategy.BitmapDocumentFormat; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertTrue; public class ReadOnlyLuceneLabelScanIndexTest { @Rule - public final TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory testDirectory = TestDirectory.testDirectory(); @Rule public final ExpectedException expectedException = ExpectedException.none(); diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexBuilderTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexBuilderTest.java index c1f2d715a3b11..7c8993f1c152e 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexBuilderTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexBuilderTest.java @@ -27,7 +27,7 @@ import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.configuration.Settings; import org.neo4j.kernel.impl.factory.OperationalMode; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -35,7 +35,7 @@ public class LuceneSchemaIndexBuilderTest { @Rule - public final TargetDirectory.TestDirectory testDir = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory testDir = TestDirectory.testDirectory(); @Test public void readOnlyIndexCreation() throws Exception 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 bb82b341ae586..1ce31d1fafb58 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 @@ -33,7 +33,7 @@ import org.neo4j.kernel.api.impl.index.storage.IndexStorageFactory; 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.TestDirectory; import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static java.util.Collections.singletonList; @@ -48,7 +48,7 @@ public class LuceneSchemaIndexCorruptionTest { @Rule - public final TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory testDirectory = TestDirectory.testDirectory(); public final EphemeralFileSystemRule fs = new EphemeralFileSystemRule(); @Test diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexIT.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexIT.java index c3f8ab77a2aac..12d2212abae2a 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexIT.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexIT.java @@ -42,7 +42,7 @@ import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.NodePropertyUpdate; import org.neo4j.kernel.impl.api.index.IndexUpdateMode; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.hamcrest.core.IsEqual.equalTo; import static org.junit.Assert.assertEquals; @@ -56,7 +56,7 @@ public class LuceneSchemaIndexIT { @Rule - public TargetDirectory.TestDirectory testDir = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory testDir = TestDirectory.testDirectory(); @Before public void before() throws Exception 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 802372aaae805..a8888cf3157a3 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.kernel.impl.factory.OperationalMode; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import org.neo4j.test.rule.fs.DefaultFileSystemRule; import static java.lang.Long.parseLong; @@ -63,7 +63,7 @@ public class LuceneSchemaIndexPopulatorTest @Rule public final DefaultFileSystemRule fs = new DefaultFileSystemRule(); @Rule - public TargetDirectory.TestDirectory testDir = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory testDir = TestDirectory.testDirectory(); private IndexDescriptor indexDescriptor; private IndexStoreView indexStoreView; 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 4474613093cbb..427fda93d0bd8 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 @@ -31,7 +31,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.TestDirectory; import org.neo4j.test.rule.fs.DefaultFileSystemRule; import static org.junit.Assert.assertTrue; @@ -41,7 +41,7 @@ public class LuceneSchemaIndexTest @Rule public final DefaultFileSystemRule fs = new DefaultFileSystemRule(); @Rule - public TargetDirectory.TestDirectory testDir = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory testDir = TestDirectory.testDirectory(); private final DirectoryFactory dirFactory = new DirectoryFactory.InMemoryDirectoryFactory(); private SchemaIndex index; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/ReadOnlyLuceneSchemaIndexTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/ReadOnlyLuceneSchemaIndexTest.java index 66d9309f7627e..b5083fc9eea49 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/ReadOnlyLuceneSchemaIndexTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/ReadOnlyLuceneSchemaIndexTest.java @@ -34,14 +34,14 @@ import org.neo4j.kernel.api.index.IndexConfiguration; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertTrue; public class ReadOnlyLuceneSchemaIndexTest { @Rule - public final TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory testDirectory = TestDirectory.testDirectory(); @Rule public final ExpectedException expectedException = ExpectedException.none(); private ReadOnlyDatabaseSchemaIndex luceneSchemaIndex; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/populator/NonUniqueDatabaseIndexPopulatorTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/populator/NonUniqueDatabaseIndexPopulatorTest.java index 0d0f574226f41..a222070534327 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/populator/NonUniqueDatabaseIndexPopulatorTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/populator/NonUniqueDatabaseIndexPopulatorTest.java @@ -41,7 +41,7 @@ import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.storageengine.api.schema.IndexSample; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -49,7 +49,7 @@ public class NonUniqueDatabaseIndexPopulatorTest { @Rule - public final TargetDirectory.TestDirectory testDir = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory testDir = TestDirectory.testDirectory(); private final DirectoryFactory dirFactory = new DirectoryFactory.InMemoryDirectoryFactory(); diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/populator/UniqueDatabaseIndexPopulatorTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/populator/UniqueDatabaseIndexPopulatorTest.java index 089b0beb4b66b..62323ee3d7e98 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/populator/UniqueDatabaseIndexPopulatorTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/populator/UniqueDatabaseIndexPopulatorTest.java @@ -49,7 +49,7 @@ import org.neo4j.test.OtherThreadExecutor; import org.neo4j.test.OtherThreadExecutor.WorkerCommand; import org.neo4j.test.rule.CleanupRule; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static java.util.Arrays.asList; import static java.util.concurrent.TimeUnit.SECONDS; @@ -68,7 +68,7 @@ public class UniqueDatabaseIndexPopulatorTest @Rule public final CleanupRule cleanup = new CleanupRule(); @Rule - public TargetDirectory.TestDirectory testDir = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory testDir = TestDirectory.testDirectory(); private static final int LABEL_ID = 1; private static final int PROPERTY_KEY_ID = 2; diff --git a/community/lucene-index/src/test/java/org/neo4j/unsafe/batchinsert/TestLuceneBatchInsert.java b/community/lucene-index/src/test/java/org/neo4j/unsafe/batchinsert/TestLuceneBatchInsert.java index 9ee28b5c8b4e4..9b5c53faa63e8 100644 --- a/community/lucene-index/src/test/java/org/neo4j/unsafe/batchinsert/TestLuceneBatchInsert.java +++ b/community/lucene-index/src/test/java/org/neo4j/unsafe/batchinsert/TestLuceneBatchInsert.java @@ -54,7 +54,7 @@ import org.neo4j.kernel.impl.api.index.inmemory.InMemoryIndexProviderFactory; import org.neo4j.kernel.impl.api.scan.InMemoryLabelScanStoreExtension; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.apache.lucene.search.NumericRangeQuery.newIntRange; import static org.hamcrest.core.Is.is; @@ -75,7 +75,7 @@ public class TestLuceneBatchInsert { @Rule - public final TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory testDirectory = TestDirectory.testDirectory(); private File storeDir; private BatchInserter inserter; diff --git a/community/lucene-index/src/test/java/org/neo4j/unsafe/batchinsert/TestLuceneSchemaBatchInsertIT.java b/community/lucene-index/src/test/java/org/neo4j/unsafe/batchinsert/TestLuceneSchemaBatchInsertIT.java index c0d9a1279b744..70934e9f852ac 100644 --- a/community/lucene-index/src/test/java/org/neo4j/unsafe/batchinsert/TestLuceneSchemaBatchInsertIT.java +++ b/community/lucene-index/src/test/java/org/neo4j/unsafe/batchinsert/TestLuceneSchemaBatchInsertIT.java @@ -36,7 +36,7 @@ import org.neo4j.kernel.extension.dependency.HighestSelectionStrategy; import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; @@ -47,7 +47,7 @@ public class TestLuceneSchemaBatchInsertIT { @Rule - public final TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory testDirectory = TestDirectory.testDirectory(); private static final Label LABEL = label( "Person" ); diff --git a/community/neo4j-harness/src/test/java/org/neo4j/harness/FixturesTest.java b/community/neo4j-harness/src/test/java/org/neo4j/harness/FixturesTest.java index a46f7a539c86a..715de16a5c5e2 100644 --- a/community/neo4j-harness/src/test/java/org/neo4j/harness/FixturesTest.java +++ b/community/neo4j-harness/src/test/java/org/neo4j/harness/FixturesTest.java @@ -31,7 +31,7 @@ import org.neo4j.server.ServerTestUtils; import org.neo4j.server.configuration.ServerSettings; import org.neo4j.test.rule.SuppressOutput; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import org.neo4j.test.server.HTTP; import static java.lang.System.lineSeparator; @@ -44,7 +44,7 @@ public class FixturesTest { @Rule - public TargetDirectory.TestDirectory testDir = TargetDirectory.testDirForTest( FixturesTest.class ); + public TestDirectory testDir = TestDirectory.testDirectory(); @Rule public SuppressOutput suppressOutput = SuppressOutput.suppressAll(); diff --git a/community/neo4j-harness/src/test/java/org/neo4j/harness/InProcessBuilderTest.java b/community/neo4j-harness/src/test/java/org/neo4j/harness/InProcessBuilderTest.java index df070749c2a71..c7b15d8479c88 100644 --- a/community/neo4j-harness/src/test/java/org/neo4j/harness/InProcessBuilderTest.java +++ b/community/neo4j-harness/src/test/java/org/neo4j/harness/InProcessBuilderTest.java @@ -56,7 +56,7 @@ import org.neo4j.server.rest.domain.JsonParseException; import org.neo4j.test.TestGraphDatabaseFactory; import org.neo4j.test.rule.SuppressOutput; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import org.neo4j.test.server.HTTP; import static org.hamcrest.CoreMatchers.equalTo; @@ -73,7 +73,7 @@ public class InProcessBuilderTest { @Rule - public TargetDirectory.TestDirectory testDir = TargetDirectory.testDirForTest( InProcessBuilderTest.class ); + public TestDirectory testDir = TestDirectory.testDirectory(); @Rule public SuppressOutput suppressOutput = SuppressOutput.suppressAll(); diff --git a/community/neo4j-harness/src/test/java/org/neo4j/harness/JUnitRuleTest.java b/community/neo4j-harness/src/test/java/org/neo4j/harness/JUnitRuleTest.java index a9a22b7fe526a..1cfc21ea00ed9 100644 --- a/community/neo4j-harness/src/test/java/org/neo4j/harness/JUnitRuleTest.java +++ b/community/neo4j-harness/src/test/java/org/neo4j/harness/JUnitRuleTest.java @@ -35,7 +35,7 @@ import org.neo4j.helpers.collection.Iterators; import org.neo4j.server.configuration.ServerSettings; import org.neo4j.test.rule.SuppressOutput; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import org.neo4j.test.server.HTTP; import static org.hamcrest.CoreMatchers.equalTo; @@ -43,13 +43,12 @@ import static org.junit.Assert.assertEquals; import static org.neo4j.server.ServerTestUtils.getRelativePath; import static org.neo4j.server.ServerTestUtils.getSharedTestTemporaryFolder; -import static org.neo4j.test.rule.TargetDirectory.testDirForTest; import static org.neo4j.test.server.HTTP.RawPayload.quotedJson; public class JUnitRuleTest { @Rule - public TargetDirectory.TestDirectory testDirectory = testDirForTest( getClass() ); + public TestDirectory testDirectory = TestDirectory.testDirectory(); @Rule public SuppressOutput suppressOutput = SuppressOutput.suppressAll(); @Rule diff --git a/community/neo4j-harness/src/test/java/org/neo4j/harness/JavaProceduresTest.java b/community/neo4j-harness/src/test/java/org/neo4j/harness/JavaProceduresTest.java index 2a8c3f0680ef9..dd15064d4398b 100644 --- a/community/neo4j-harness/src/test/java/org/neo4j/harness/JavaProceduresTest.java +++ b/community/neo4j-harness/src/test/java/org/neo4j/harness/JavaProceduresTest.java @@ -45,7 +45,7 @@ import org.neo4j.procedure.Name; import org.neo4j.procedure.Procedure; import org.neo4j.test.rule.SuppressOutput; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import org.neo4j.test.server.HTTP; import static org.hamcrest.CoreMatchers.containsString; @@ -56,7 +56,7 @@ public class JavaProceduresTest { @Rule - public TargetDirectory.TestDirectory testDir = TargetDirectory.testDirForTest( InProcessBuilderTest.class ); + public TestDirectory testDir = TestDirectory.testDirectory(); @Rule public SuppressOutput suppressOutput = SuppressOutput.suppressAll(); diff --git a/community/neo4j/src/test/java/db/DatabaseStartupTest.java b/community/neo4j/src/test/java/db/DatabaseStartupTest.java index 355454a4b87d7..c8580f511a3d3 100644 --- a/community/neo4j/src/test/java/db/DatabaseStartupTest.java +++ b/community/neo4j/src/test/java/db/DatabaseStartupTest.java @@ -35,7 +35,7 @@ import org.neo4j.kernel.impl.storemigration.UpgradeNotAllowedByConfigurationException; import org.neo4j.kernel.lifecycle.LifecycleException; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.hamcrest.Matchers.containsString; import static org.junit.Assert.assertEquals; @@ -46,7 +46,7 @@ public class DatabaseStartupTest { @Rule - public final TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory testDirectory = TestDirectory.testDirectory(); @Test public void startTheDatabaseWithWrongVersionShouldFailWithUpgradeNotAllowed() throws Throwable diff --git a/community/neo4j/src/test/java/org/neo4j/index/IndexSamplingIntegrationTest.java b/community/neo4j/src/test/java/org/neo4j/index/IndexSamplingIntegrationTest.java index e03eb6ca16383..0cdf4f4cc09cc 100644 --- a/community/neo4j/src/test/java/org/neo4j/index/IndexSamplingIntegrationTest.java +++ b/community/neo4j/src/test/java/org/neo4j/index/IndexSamplingIntegrationTest.java @@ -36,19 +36,19 @@ import org.neo4j.kernel.impl.store.counts.CountsTracker; import org.neo4j.kernel.impl.store.counts.keys.CountsKeyFactory; import org.neo4j.kernel.impl.store.counts.keys.IndexSampleKey; -import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.impl.store.counts.keys.IndexStatisticsKey; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.register.Register.DoubleLongRegister; import org.neo4j.register.Registers; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertEquals; public class IndexSamplingIntegrationTest { @Rule - public final TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory testDirectory = TestDirectory.testDirectory(); private final Label label = Label.label( "Person" ); private final String property = "name"; diff --git a/community/neo4j/src/test/java/recovery/TestRecoveryMultipleDataSources.java b/community/neo4j/src/test/java/recovery/TestRecoveryMultipleDataSources.java index 9adb1b7b8f250..3b71cfd4a701b 100644 --- a/community/neo4j/src/test/java/recovery/TestRecoveryMultipleDataSources.java +++ b/community/neo4j/src/test/java/recovery/TestRecoveryMultipleDataSources.java @@ -33,7 +33,7 @@ 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.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static java.lang.Runtime.getRuntime; import static java.lang.System.exit; @@ -42,7 +42,7 @@ public class TestRecoveryMultipleDataSources { @Rule - public final TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory testDirectory = TestDirectory.testDirectory(); /** * Tests an issue where loading all relationship types and property indexes after diff --git a/community/neo4j/src/test/java/recovery/UniquenessRecoveryTest.java b/community/neo4j/src/test/java/recovery/UniquenessRecoveryTest.java index fc5dec494125e..c8bbee8eecc36 100644 --- a/community/neo4j/src/test/java/recovery/UniquenessRecoveryTest.java +++ b/community/neo4j/src/test/java/recovery/UniquenessRecoveryTest.java @@ -19,6 +19,11 @@ */ package recovery; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + import java.io.BufferedReader; import java.io.File; import java.io.IOException; @@ -29,11 +34,6 @@ import java.util.List; import java.util.Set; -import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; - import org.neo4j.graphdb.ConstraintViolationException; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Node; @@ -47,17 +47,14 @@ import org.neo4j.io.pagecache.PageCache; import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.test.rule.SuppressOutput; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static java.lang.Boolean.getBoolean; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assume.assumeNotNull; - import static org.neo4j.graphdb.Label.label; import static org.neo4j.test.rule.SuppressOutput.suppress; -import static org.neo4j.test.rule.TargetDirectory.testDirForTest; @RunWith( Parameterized.class ) public class UniquenessRecoveryTest @@ -85,7 +82,7 @@ private static String param( String name ) @Rule public final SuppressOutput muted = suppress( SuppressOutput.System.out ); @Rule - public final TargetDirectory.TestDirectory dir = testDirForTest( UniquenessRecoveryTest.class ); + public final TestDirectory dir = TestDirectory.testDirectory(); private final Configuration config; private static final Field PID; diff --git a/community/neo4j/src/test/java/schema/MultipleIndexPopulationStressIT.java b/community/neo4j/src/test/java/schema/MultipleIndexPopulationStressIT.java index d394c820e06c4..45396050b31f4 100644 --- a/community/neo4j/src/test/java/schema/MultipleIndexPopulationStressIT.java +++ b/community/neo4j/src/test/java/schema/MultipleIndexPopulationStressIT.java @@ -57,7 +57,7 @@ import org.neo4j.test.RepeatRule; import org.neo4j.test.rule.CleanupRule; import org.neo4j.test.rule.RandomRule; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import org.neo4j.unsafe.impl.batchimport.BatchImporter; import org.neo4j.unsafe.impl.batchimport.InputIterable; import org.neo4j.unsafe.impl.batchimport.ParallelBatchImporter; @@ -92,7 +92,7 @@ public class MultipleIndexPopulationStressIT { private static final String[] TOKENS = new String[]{"One", "Two", "Three", "Four"}; - private final TargetDirectory.TestDirectory directory = TargetDirectory.testDirForTest( getClass() ); + private final TestDirectory directory = TestDirectory.testDirectory(); private final RandomRule random = new RandomRule(); private final CleanupRule cleanup = new CleanupRule(); diff --git a/community/neo4j/src/test/java/synchronization/ConcurrentChangesOnEntitiesTest.java b/community/neo4j/src/test/java/synchronization/ConcurrentChangesOnEntitiesTest.java index 627a0f6c7cb33..26be44a8e409c 100644 --- a/community/neo4j/src/test/java/synchronization/ConcurrentChangesOnEntitiesTest.java +++ b/community/neo4j/src/test/java/synchronization/ConcurrentChangesOnEntitiesTest.java @@ -19,15 +19,15 @@ */ package synchronization; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; + import java.io.IOException; import java.util.concurrent.CyclicBarrier; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Consumer; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; - import org.neo4j.consistency.ConsistencyCheckService; import org.neo4j.consistency.checking.full.ConsistencyCheckIncompleteException; import org.neo4j.graphdb.GraphDatabaseService; @@ -41,7 +41,7 @@ import org.neo4j.kernel.configuration.Config; import org.neo4j.logging.FormattedLogProvider; import org.neo4j.logging.LogProvider; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -49,7 +49,7 @@ public class ConcurrentChangesOnEntitiesTest { @Rule - public TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory testDirectory = TestDirectory.testDirectory(); private final CyclicBarrier barrier = new CyclicBarrier( 2 ); private final AtomicReference ex = new AtomicReference<>(); private GraphDatabaseService db; diff --git a/community/neo4j/src/test/java/upgrade/FailToStartStoreMigratorIT.java b/community/neo4j/src/test/java/upgrade/FailToStartStoreMigratorIT.java index a3a6721de3d60..0effeb39cc947 100644 --- a/community/neo4j/src/test/java/upgrade/FailToStartStoreMigratorIT.java +++ b/community/neo4j/src/test/java/upgrade/FailToStartStoreMigratorIT.java @@ -31,7 +31,7 @@ import org.neo4j.test.TestGraphDatabaseFactory; import org.neo4j.test.Unzip; import org.neo4j.test.rule.CleanupRule; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.hamcrest.CoreMatchers.instanceOf; import static org.junit.Assert.assertNull; @@ -42,7 +42,7 @@ public class FailToStartStoreMigratorIT { @Rule - public final TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory testDirectory = TestDirectory.testDirectory(); @Rule public final CleanupRule cleanup = new CleanupRule(); diff --git a/community/neo4j/src/test/java/upgrade/PlatformConstraintStoreUpgradeTest.java b/community/neo4j/src/test/java/upgrade/PlatformConstraintStoreUpgradeTest.java index db0ec72b98f67..d476314bcb208 100644 --- a/community/neo4j/src/test/java/upgrade/PlatformConstraintStoreUpgradeTest.java +++ b/community/neo4j/src/test/java/upgrade/PlatformConstraintStoreUpgradeTest.java @@ -33,7 +33,7 @@ import org.neo4j.kernel.impl.store.format.standard.StandardV2_2; import org.neo4j.kernel.impl.storemigration.StoreUpgrader; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -43,7 +43,7 @@ public class PlatformConstraintStoreUpgradeTest { @Rule - public TargetDirectory.TestDirectory storeDir = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory storeDir = TestDirectory.testDirectory(); private FileSystemAbstraction fileSystem; private File prepareDir; diff --git a/community/neo4j/src/test/java/upgrade/StoreUpgradeOnStartupTest.java b/community/neo4j/src/test/java/upgrade/StoreUpgradeOnStartupTest.java index d0f6f7dc4d35b..33e541b1badb6 100644 --- a/community/neo4j/src/test/java/upgrade/StoreUpgradeOnStartupTest.java +++ b/community/neo4j/src/test/java/upgrade/StoreUpgradeOnStartupTest.java @@ -46,7 +46,7 @@ import org.neo4j.kernel.impl.storemigration.StoreVersionCheck; import org.neo4j.test.TestGraphDatabaseFactory; import org.neo4j.test.rule.PageCacheRule; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; @@ -64,7 +64,7 @@ public class StoreUpgradeOnStartupTest { @Rule - public TargetDirectory.TestDirectory testDir = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory testDir = TestDirectory.testDirectory(); @Rule public PageCacheRule pageCacheRule = new PageCacheRule(); @Parameterized.Parameter( 0 ) diff --git a/community/neo4j/src/test/java/upgrade/StoreUpgraderInterruptionTestIT.java b/community/neo4j/src/test/java/upgrade/StoreUpgraderInterruptionTestIT.java index 59bc995224027..08bfa07efa501 100644 --- a/community/neo4j/src/test/java/upgrade/StoreUpgraderInterruptionTestIT.java +++ b/community/neo4j/src/test/java/upgrade/StoreUpgraderInterruptionTestIT.java @@ -61,8 +61,7 @@ import org.neo4j.kernel.impl.storemigration.participant.StoreMigrator; import org.neo4j.logging.NullLogProvider; import org.neo4j.test.rule.PageCacheRule; -import org.neo4j.test.rule.TargetDirectory; -import org.neo4j.test.rule.TargetDirectory.TestDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -93,7 +92,7 @@ public static Collection versions() } @Rule - public final TestDirectory directory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory directory = TestDirectory.testDirectory(); @Rule public final PageCacheRule pageCacheRule = new PageCacheRule(); private final FileSystemAbstraction fs = new DefaultFileSystemAbstraction(); diff --git a/community/neo4j/src/test/java/upgrade/StoreUpgraderTest.java b/community/neo4j/src/test/java/upgrade/StoreUpgraderTest.java index 1372e78f05c0a..4bb9da16becd5 100644 --- a/community/neo4j/src/test/java/upgrade/StoreUpgraderTest.java +++ b/community/neo4j/src/test/java/upgrade/StoreUpgraderTest.java @@ -71,8 +71,7 @@ import org.neo4j.logging.NullLogProvider; import org.neo4j.test.TestGraphDatabaseFactory; import org.neo4j.test.rule.PageCacheRule; -import org.neo4j.test.rule.TargetDirectory; -import org.neo4j.test.rule.TargetDirectory.TestDirectory; +import org.neo4j.test.rule.TestDirectory; import static java.util.concurrent.TimeUnit.MINUTES; import static org.hamcrest.Matchers.emptyCollectionOf; @@ -105,7 +104,7 @@ public class StoreUpgraderTest { @Rule - public final TestDirectory directory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory directory = TestDirectory.testDirectory(); @Rule public final PageCacheRule pageCacheRule = new PageCacheRule(); private File dbDirectory; diff --git a/community/neo4j/src/test/java/upgrade/TestMigrateToDenseNodeSupport.java b/community/neo4j/src/test/java/upgrade/TestMigrateToDenseNodeSupport.java index 63a50b7aea60e..7c80b9d9827d1 100644 --- a/community/neo4j/src/test/java/upgrade/TestMigrateToDenseNodeSupport.java +++ b/community/neo4j/src/test/java/upgrade/TestMigrateToDenseNodeSupport.java @@ -47,7 +47,7 @@ import org.neo4j.storageengine.api.NodeItem; import org.neo4j.test.TestGraphDatabaseFactory; import org.neo4j.test.Unzip; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -116,7 +116,7 @@ public void assertValueEquals( Object otherValue ) } @Rule - public TargetDirectory.TestDirectory testDir = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory testDir = TestDirectory.testDirectory(); private File dir; @Before diff --git a/community/security/src/test/java/org/neo4j/commandline/admin/security/SetPasswordCommandTest.java b/community/security/src/test/java/org/neo4j/commandline/admin/security/SetPasswordCommandTest.java index 9fc495452e005..6d86395f559e2 100644 --- a/community/security/src/test/java/org/neo4j/commandline/admin/security/SetPasswordCommandTest.java +++ b/community/security/src/test/java/org/neo4j/commandline/admin/security/SetPasswordCommandTest.java @@ -37,7 +37,7 @@ import org.neo4j.server.security.auth.Credential; import org.neo4j.server.security.auth.FileUserRepository; import org.neo4j.server.security.auth.User; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.hamcrest.CoreMatchers.hasItem; import static org.hamcrest.Matchers.containsString; @@ -52,8 +52,8 @@ public class SetPasswordCommandTest { - private TargetDirectory.TestDirectory testDir = TargetDirectory.testDirForTest( getClass() ); private static String password_change_required = "password_change_required"; + private TestDirectory testDir = TestDirectory.testDirectory(); @Rule public RuleChain ruleChain = RuleChain.outerRule( testDir ); diff --git a/community/server/src/test/java/org/neo4j/server/BlockingBootstrapperTest.java b/community/server/src/test/java/org/neo4j/server/BlockingBootstrapperTest.java index dfa8cb145d252..9b8f6aec43375 100644 --- a/community/server/src/test/java/org/neo4j/server/BlockingBootstrapperTest.java +++ b/community/server/src/test/java/org/neo4j/server/BlockingBootstrapperTest.java @@ -19,8 +19,8 @@ */ package org.neo4j.server; -import org.junit.Test; import org.junit.Rule; +import org.junit.Test; import java.io.File; import java.util.Optional; @@ -29,7 +29,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.neo4j.helpers.collection.Pair; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; @@ -38,7 +38,7 @@ public class BlockingBootstrapperTest { @Rule - public TargetDirectory.TestDirectory homeDir = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory homeDir = TestDirectory.testDirectory(); @Test public void shouldBlockUntilStoppedIfTheWrappedStartIsSuccessful() throws Throwable diff --git a/community/server/src/test/java/org/neo4j/server/integration/StartupLoggingIT.java b/community/server/src/test/java/org/neo4j/server/integration/StartupLoggingIT.java index 408beacb0bb9e..ebd63c39d1d3d 100644 --- a/community/server/src/test/java/org/neo4j/server/integration/StartupLoggingIT.java +++ b/community/server/src/test/java/org/neo4j/server/integration/StartupLoggingIT.java @@ -41,7 +41,7 @@ import org.neo4j.server.CommunityBootstrapper; import org.neo4j.server.ServerTestUtils; import org.neo4j.test.rule.SuppressOutput; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import org.neo4j.test.server.ExclusiveServerTestBase; import static java.util.Arrays.asList; @@ -60,7 +60,7 @@ public void setUp() throws IOException } @Rule - public TargetDirectory.TestDirectory homeDir = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory homeDir = TestDirectory.testDirectory(); @Test public void shouldLogHelpfulStartupMessages() throws Throwable diff --git a/community/server/src/test/java/org/neo4j/server/web/logging/HTTPLoggingDocIT.java b/community/server/src/test/java/org/neo4j/server/web/logging/HTTPLoggingDocIT.java index 2ebcbfdd8bac9..6838e69cd0425 100644 --- a/community/server/src/test/java/org/neo4j/server/web/logging/HTTPLoggingDocIT.java +++ b/community/server/src/test/java/org/neo4j/server/web/logging/HTTPLoggingDocIT.java @@ -38,7 +38,7 @@ import org.neo4j.server.helpers.FunctionalTestHelper; import org.neo4j.server.rest.JaxRsResponse; import org.neo4j.server.rest.RestRequest; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import org.neo4j.test.server.ExclusiveServerTestBase; import static org.hamcrest.CoreMatchers.is; @@ -134,7 +134,7 @@ public void givenExplicitlyEnabledServerLoggingConfigurationShouldLogAccess() th } @Rule - public final TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory testDirectory = TestDirectory.testDirectory(); private ThrowingSupplier fileContentSupplier( final File file ) { diff --git a/community/server/src/test/java/org/neo4j/test/server/ExclusiveServerTestBase.java b/community/server/src/test/java/org/neo4j/test/server/ExclusiveServerTestBase.java index 6c6dee4e2ac62..e9109c755f488 100644 --- a/community/server/src/test/java/org/neo4j/test/server/ExclusiveServerTestBase.java +++ b/community/server/src/test/java/org/neo4j/test/server/ExclusiveServerTestBase.java @@ -26,14 +26,14 @@ import java.util.concurrent.Callable; import org.neo4j.test.rule.SuppressOutput; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.neo4j.test.rule.SuppressOutput.suppressAll; public class ExclusiveServerTestBase { @Rule - public TargetDirectory.TestDirectory folder = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory folder = TestDirectory.testDirectory( ); @Rule public SuppressOutput suppressOutput = suppressAll(); @Rule diff --git a/community/shell/src/test/java/org/neo4j/shell/TestRmiPublication.java b/community/shell/src/test/java/org/neo4j/shell/TestRmiPublication.java index e4cf044bf0920..5967b7fd35db1 100644 --- a/community/shell/src/test/java/org/neo4j/shell/TestRmiPublication.java +++ b/community/shell/src/test/java/org/neo4j/shell/TestRmiPublication.java @@ -31,7 +31,7 @@ import org.neo4j.graphdb.factory.GraphDatabaseSettings; import org.neo4j.test.ProcessStreamHandler; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static java.lang.Runtime.getRuntime; import static java.lang.System.getProperty; @@ -64,7 +64,7 @@ public void jvmShouldDieEvenIfLocalServerIsLeftHanging() throws Exception } @Rule - public TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory testDirectory = TestDirectory.testDirectory(); private int spawnJvm( Class mainClass, String name ) throws Exception { diff --git a/community/udc/src/test/java/org/neo4j/ext/udc/impl/DefaultUdcInformationCollectorTest.java b/community/udc/src/test/java/org/neo4j/ext/udc/impl/DefaultUdcInformationCollectorTest.java index 7b5dc4f752de5..dc0148c15c36e 100644 --- a/community/udc/src/test/java/org/neo4j/ext/udc/impl/DefaultUdcInformationCollectorTest.java +++ b/community/udc/src/test/java/org/neo4j/ext/udc/impl/DefaultUdcInformationCollectorTest.java @@ -43,7 +43,7 @@ import org.neo4j.kernel.impl.store.id.IdType; import org.neo4j.kernel.impl.transaction.state.DataSourceManager; import org.neo4j.kernel.impl.util.JobScheduler; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import org.neo4j.udc.UsageData; import org.neo4j.udc.UsageDataKeys; @@ -61,7 +61,7 @@ public class DefaultUdcInformationCollectorTest { @Rule - public final TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory testDirectory = TestDirectory.testDirectory(); private final UsageData usageData = new UsageData( mock( JobScheduler.class ) ); private final DefaultUdcInformationCollector collector = new DefaultUdcInformationCollector( diff --git a/enterprise/backup/src/test/java/org/neo4j/backup/BackupEmbeddedIT.java b/enterprise/backup/src/test/java/org/neo4j/backup/BackupEmbeddedIT.java index 5132dae2745af..f589b5ea40a4e 100644 --- a/enterprise/backup/src/test/java/org/neo4j/backup/BackupEmbeddedIT.java +++ b/enterprise/backup/src/test/java/org/neo4j/backup/BackupEmbeddedIT.java @@ -49,16 +49,15 @@ import org.neo4j.test.ProcessStreamHandler; import org.neo4j.test.rule.EmbeddedDatabaseRule; import org.neo4j.test.rule.SuppressOutput; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertEquals; -import static org.neo4j.test.rule.TargetDirectory.testDirForTest; @RunWith( Parameterized.class ) public class BackupEmbeddedIT { @ClassRule - public static final TargetDirectory.TestDirectory testDirectory = testDirForTest( BackupEmbeddedIT.class ); + public static final TestDirectory testDirectory = TestDirectory.testDirectory(); private final EmbeddedDatabaseRule db = new EmbeddedDatabaseRule( testDirectory.directory( "db" ) ).startLazily(); diff --git a/enterprise/backup/src/test/java/org/neo4j/backup/BackupServiceIT.java b/enterprise/backup/src/test/java/org/neo4j/backup/BackupServiceIT.java index 0a2cab12b01ff..1a997e384131d 100644 --- a/enterprise/backup/src/test/java/org/neo4j/backup/BackupServiceIT.java +++ b/enterprise/backup/src/test/java/org/neo4j/backup/BackupServiceIT.java @@ -54,8 +54,8 @@ import org.neo4j.io.pagecache.PageCache; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.factory.DatabaseInfo; -import org.neo4j.kernel.impl.spi.SimpleKernelContext; import org.neo4j.kernel.impl.logging.LogService; +import org.neo4j.kernel.impl.spi.SimpleKernelContext; import org.neo4j.kernel.impl.store.MetaDataStore; import org.neo4j.kernel.impl.store.MetaDataStore.Position; import org.neo4j.kernel.impl.store.MismatchingStoreIdException; @@ -89,7 +89,7 @@ import org.neo4j.test.rule.EmbeddedDatabaseRule; import org.neo4j.test.rule.PageCacheRule; import org.neo4j.test.rule.SuppressOutput; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static java.util.concurrent.TimeUnit.SECONDS; import static org.hamcrest.CoreMatchers.containsString; @@ -129,7 +129,7 @@ public void finishStreamingStoreFile( File storefile ) } @Rule - public final TargetDirectory.TestDirectory target = TargetDirectory.testDirForTest( BackupServiceIT.class ); + public final TestDirectory target = TestDirectory.testDirectory(); private static final String NODE_STORE = StoreFactory.NODE_STORE_NAME; private static final String RELATIONSHIP_STORE = StoreFactory.RELATIONSHIP_STORE_NAME; private static final String BACKUP_HOST = "localhost"; diff --git a/enterprise/backup/src/test/java/org/neo4j/backup/BackupToolTest.java b/enterprise/backup/src/test/java/org/neo4j/backup/BackupToolTest.java index bc5a5712ddc65..1eecdb5252b87 100644 --- a/enterprise/backup/src/test/java/org/neo4j/backup/BackupToolTest.java +++ b/enterprise/backup/src/test/java/org/neo4j/backup/BackupToolTest.java @@ -33,7 +33,7 @@ import org.neo4j.helpers.HostnamePort; import org.neo4j.kernel.configuration.Config; import org.neo4j.test.rule.SuppressOutput; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import org.neo4j.test.rule.system.SystemExitRule; import static org.hamcrest.CoreMatchers.containsString; @@ -61,7 +61,7 @@ public class BackupToolTest @Rule public SystemExitRule systemExitRule = SystemExitRule.none(); @Rule - public TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory testDirectory = TestDirectory.testDirectory(); @Rule public SuppressOutput suppressOutput = SuppressOutput.suppressAll(); diff --git a/enterprise/backup/src/test/java/org/neo4j/backup/IncrementalBackupTests.java b/enterprise/backup/src/test/java/org/neo4j/backup/IncrementalBackupTests.java index 7a0f6ab976312..ffb713fb75915 100644 --- a/enterprise/backup/src/test/java/org/neo4j/backup/IncrementalBackupTests.java +++ b/enterprise/backup/src/test/java/org/neo4j/backup/IncrementalBackupTests.java @@ -39,7 +39,7 @@ import org.neo4j.test.DbRepresentation; import org.neo4j.test.TestGraphDatabaseFactory; import org.neo4j.test.rule.SuppressOutput; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertEquals; @@ -48,7 +48,7 @@ public class IncrementalBackupTests @Rule public TestName testName = new TestName(); @Rule - public TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory testDirectory = TestDirectory.testDirectory(); @Rule public SuppressOutput suppressOutput = SuppressOutput.suppressAll(); diff --git a/enterprise/backup/src/test/java/org/neo4j/backup/PlatformConstraintBackupTest.java b/enterprise/backup/src/test/java/org/neo4j/backup/PlatformConstraintBackupTest.java index 05e0311d0ec9c..ab15fc2e35aca 100644 --- a/enterprise/backup/src/test/java/org/neo4j/backup/PlatformConstraintBackupTest.java +++ b/enterprise/backup/src/test/java/org/neo4j/backup/PlatformConstraintBackupTest.java @@ -30,7 +30,7 @@ import org.neo4j.graphdb.factory.GraphDatabaseSettings; import org.neo4j.kernel.configuration.Settings; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -39,7 +39,7 @@ public class PlatformConstraintBackupTest { @Rule - public TargetDirectory.TestDirectory storeDir = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory storeDir = TestDirectory.testDirectory(); private File workingDir; diff --git a/enterprise/backup/src/test/java/org/neo4j/backup/TestBackup.java b/enterprise/backup/src/test/java/org/neo4j/backup/TestBackup.java index 5db1eb7d33071..ec5a8ee8d2e44 100644 --- a/enterprise/backup/src/test/java/org/neo4j/backup/TestBackup.java +++ b/enterprise/backup/src/test/java/org/neo4j/backup/TestBackup.java @@ -70,7 +70,7 @@ import org.neo4j.test.TestGraphDatabaseFactory; import org.neo4j.test.rule.PageCacheRule; import org.neo4j.test.rule.SuppressOutput; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import org.neo4j.test.subprocess.SubProcess; import static java.lang.Integer.parseInt; @@ -86,7 +86,7 @@ @RunWith( Parameterized.class ) public class TestBackup { - private final TargetDirectory.TestDirectory testDir = TargetDirectory.testDirForTest( TestBackup.class ); + private final TestDirectory testDir = TestDirectory.testDirectory(); private final PageCacheRule pageCacheRule = new PageCacheRule(); @Rule diff --git a/enterprise/backup/src/test/java/org/neo4j/restore/RestoreDatabaseCommandTest.java b/enterprise/backup/src/test/java/org/neo4j/restore/RestoreDatabaseCommandTest.java index 1898d7b6f690d..d525ce980a418 100644 --- a/enterprise/backup/src/test/java/org/neo4j/restore/RestoreDatabaseCommandTest.java +++ b/enterprise/backup/src/test/java/org/neo4j/restore/RestoreDatabaseCommandTest.java @@ -19,11 +19,11 @@ */ package org.neo4j.restore; -import java.io.File; - import org.junit.Rule; import org.junit.Test; +import java.io.File; + import org.neo4j.dbms.DatabaseManagementSystemSettings; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Transaction; @@ -32,18 +32,17 @@ import org.neo4j.io.fs.DefaultFileSystemAbstraction; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.kernel.configuration.Config; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; - import static org.neo4j.helpers.collection.MapUtil.stringMap; public class RestoreDatabaseCommandTest { @Rule - public final TargetDirectory.TestDirectory directory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory directory = TestDirectory.testDirectory(); @Test public void shouldNotCopyOverAndExistingDatabase() throws Exception diff --git a/enterprise/com/src/test/java/org/neo4j/com/storecopy/StoreCopyClientTest.java b/enterprise/com/src/test/java/org/neo4j/com/storecopy/StoreCopyClientTest.java index 284bc3b958670..bbc0fc83ad35e 100644 --- a/enterprise/com/src/test/java/org/neo4j/com/storecopy/StoreCopyClientTest.java +++ b/enterprise/com/src/test/java/org/neo4j/com/storecopy/StoreCopyClientTest.java @@ -56,7 +56,7 @@ import org.neo4j.test.TestGraphDatabaseFactory; import org.neo4j.test.rule.CleanupRule; import org.neo4j.test.rule.PageCacheRule; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertEquals; @@ -72,7 +72,7 @@ public class StoreCopyClientTest { - private TargetDirectory.TestDirectory testDir = TargetDirectory.testDirForTest( getClass() ); + private TestDirectory testDir = TestDirectory.testDirectory(); private PageCacheRule pageCacheRule = new PageCacheRule(); private CleanupRule cleanup = new CleanupRule(); diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/backup/RestoreClusterCliTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/backup/RestoreClusterCliTest.java index 01d8cadcab682..9ed9c403db1f5 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/backup/RestoreClusterCliTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/backup/RestoreClusterCliTest.java @@ -19,6 +19,9 @@ */ package org.neo4j.coreedge.backup; +import org.junit.Rule; +import org.junit.Test; + import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; @@ -27,9 +30,6 @@ import java.nio.file.Paths; import java.util.Optional; -import org.junit.Rule; -import org.junit.Test; - import org.neo4j.coreedge.convert.ClusterSeed; import org.neo4j.coreedge.convert.StoreMetadata; import org.neo4j.coreedge.identity.StoreId; @@ -43,12 +43,11 @@ import org.neo4j.kernel.impl.store.format.standard.StandardV3_0; import org.neo4j.server.configuration.ConfigLoader; import org.neo4j.test.coreedge.ClusterRule; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static junit.framework.TestCase.assertFalse; import static junit.framework.TestCase.assertTrue; import static org.junit.Assert.assertEquals; - import static org.neo4j.coreedge.backup.ArgsBuilder.toArray; import static org.neo4j.coreedge.convert.GenerateClusterSeedCommand.storeId; import static org.neo4j.kernel.impl.store.MetaDataStore.Position.LAST_TRANSACTION_ID; @@ -59,7 +58,7 @@ public class RestoreClusterCliTest { @Rule - public TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory testDirectory = TestDirectory.testDirectory(); @Rule public final ClusterRule clusterRule = new ClusterRule( getClass() ) diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/convert/GenerateClusterSeedCommandTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/convert/GenerateClusterSeedCommandTest.java index 7ff05b57a4d7e..afcd887812e8f 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/convert/GenerateClusterSeedCommandTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/convert/GenerateClusterSeedCommandTest.java @@ -28,16 +28,15 @@ import org.neo4j.backup.BackupEmbeddedIT; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import org.neo4j.time.FakeClock; import static org.junit.Assert.assertNotEquals; -import static org.neo4j.test.rule.TargetDirectory.testDirForTest; public class GenerateClusterSeedCommandTest { @Rule - public final TargetDirectory.TestDirectory testDirectory = testDirForTest( getClass() ); + public final TestDirectory testDirectory = TestDirectory.testDirectory(); @Test public void shouldGenerateDifferentSeeds() throws Exception diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/consensus/log/ConcurrentStressIT.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/consensus/log/ConcurrentStressIT.java index ea06897e45c22..ce1886d5466e3 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/consensus/log/ConcurrentStressIT.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/consensus/log/ConcurrentStressIT.java @@ -36,7 +36,7 @@ import org.neo4j.io.fs.DefaultFileSystemAbstraction; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.kernel.lifecycle.Lifecycle; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static java.util.concurrent.TimeUnit.SECONDS; import static org.junit.Assert.assertEquals; @@ -45,7 +45,7 @@ public abstract class ConcurrentStressIT { private static final int MAX_CONTENT_SIZE = 2048; @Rule - public final TargetDirectory.TestDirectory dir = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory dir = TestDirectory.testDirectory(); protected abstract T createRaftLog( FileSystemAbstraction fsa, File dir ) throws Throwable; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/consensus/log/segmented/SegmentedRaftLogRotationTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/consensus/log/segmented/SegmentedRaftLogRotationTest.java index 4bf78e4f5d890..7af70d286e59a 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/consensus/log/segmented/SegmentedRaftLogRotationTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/consensus/log/segmented/SegmentedRaftLogRotationTest.java @@ -35,20 +35,18 @@ import org.neo4j.kernel.lifecycle.Lifespan; import org.neo4j.logging.NullLogProvider; import org.neo4j.test.OnDemandJobScheduler; -import org.neo4j.test.rule.Resources; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import org.neo4j.time.FakeClock; import static org.junit.Assert.assertEquals; import static org.neo4j.coreedge.core.CoreEdgeClusterSettings.raft_log_pruning_strategy; -import static org.neo4j.test.rule.Resources.InitialLifecycle.STARTED; public class SegmentedRaftLogRotationTest { private static final int ROTATE_AT_SIZE_IN_BYTES = 100; @Rule - public final TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory testDirectory = TestDirectory.testDirectory(); @Rule public final LifeRule life = new LifeRule( true ); diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/consensus/membership/RaftMembershipStateRecoveryManagerTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/consensus/membership/RaftMembershipStateRecoveryManagerTest.java index 1b6b776d95558..b9f7850b68132 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/consensus/membership/RaftMembershipStateRecoveryManagerTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/consensus/membership/RaftMembershipStateRecoveryManagerTest.java @@ -22,12 +22,12 @@ import org.junit.Rule; import org.junit.Test; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; public class RaftMembershipStateRecoveryManagerTest { @Rule - public TargetDirectory.TestDirectory testDir = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory testDir = TestDirectory.testDirectory(); @Test public void shouldReturnCorrectLogIndex() throws Exception diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/machines/id/StateRecoveryManagerTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/machines/id/StateRecoveryManagerTest.java index 0c40d2c574669..04ecc46eaadc4 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/machines/id/StateRecoveryManagerTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/machines/id/StateRecoveryManagerTest.java @@ -27,13 +27,13 @@ import java.io.IOException; import java.nio.ByteBuffer; -import org.neo4j.coreedge.core.state.storage.SafeStateMarshal; import org.neo4j.coreedge.core.state.StateRecoveryManager; +import org.neo4j.coreedge.core.state.storage.SafeStateMarshal; import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction; import org.neo4j.io.fs.StoreChannel; import org.neo4j.storageengine.api.ReadableChannel; import org.neo4j.storageengine.api.WritableChannel; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -41,7 +41,7 @@ public class StateRecoveryManagerTest { @Rule - public TargetDirectory.TestDirectory testDir = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory testDir = TestDirectory.testDirectory(); private final int NUMBER_OF_RECORDS_PER_FILE = 100; private final int NUMBER_OF_BYTES_PER_RECORD = 10; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/machines/locks/ReplicatedLockTokenStateMachineTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/machines/locks/ReplicatedLockTokenStateMachineTest.java index d4cb4c89df4fe..5e98dad885fd5 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/machines/locks/ReplicatedLockTokenStateMachineTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/machines/locks/ReplicatedLockTokenStateMachineTest.java @@ -30,7 +30,7 @@ import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction; import org.neo4j.kernel.lifecycle.Lifespan; import org.neo4j.logging.NullLogProvider; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; @@ -175,7 +175,7 @@ public void shouldOnlyAcceptNextImmediateId() throws Exception } @Rule - public TargetDirectory.TestDirectory testDir = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory testDir = TestDirectory.testDirectory(); @Test public void shouldPersistAndRecoverState() throws Exception diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/storage/DurableStateStorageIT.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/storage/DurableStateStorageIT.java index 80c88496d7ea9..f4d433317acda 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/storage/DurableStateStorageIT.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/storage/DurableStateStorageIT.java @@ -38,7 +38,7 @@ import org.neo4j.logging.NullLogProvider; import org.neo4j.storageengine.api.ReadableChannel; import org.neo4j.storageengine.api.WritableChannel; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.junit.Assert.assertEquals; @@ -48,7 +48,7 @@ public class DurableStateStorageIT { @Rule - public TargetDirectory.TestDirectory testDir = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory testDir = TestDirectory.testDirectory( getClass() ); @Test public void shouldRecoverAfterCrashUnderLoad() throws Exception diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/storage/DurableStateStorageTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/storage/DurableStateStorageTest.java index f526ff8fa6b4e..6f1e4a0a0afff 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/storage/DurableStateStorageTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/storage/DurableStateStorageTest.java @@ -27,26 +27,23 @@ import java.nio.BufferUnderflowException; import java.nio.ByteBuffer; import java.util.concurrent.atomic.AtomicInteger; -import java.util.function.Supplier; import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction; import org.neo4j.io.fs.StoreChannel; -import org.neo4j.kernel.internal.DatabaseHealth; import org.neo4j.kernel.lifecycle.LifeRule; import org.neo4j.kernel.lifecycle.Lifespan; import org.neo4j.logging.NullLogProvider; import org.neo4j.storageengine.api.ReadableChannel; import org.neo4j.storageengine.api.WritableChannel; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import static org.mockito.Mockito.mock; public class DurableStateStorageTest { @Rule - public TargetDirectory.TestDirectory testDir = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory testDir = TestDirectory.testDirectory(); @Rule public LifeRule lifeRule = new LifeRule( true ); diff --git a/enterprise/core-edge/src/test/java/org/neo4j/test/coreedge/ClusterRule.java b/enterprise/core-edge/src/test/java/org/neo4j/test/coreedge/ClusterRule.java index 72d4a8511add1..3fabf234288b0 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/test/coreedge/ClusterRule.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/test/coreedge/ClusterRule.java @@ -23,23 +23,23 @@ import org.junit.runner.Description; import org.junit.runners.model.Statement; +import java.io.File; +import java.util.HashMap; +import java.util.Map; +import java.util.function.IntFunction; + import org.neo4j.coreedge.discovery.Cluster; import org.neo4j.coreedge.discovery.DiscoveryServiceFactory; import org.neo4j.coreedge.discovery.SharedDiscoveryService; import org.neo4j.graphdb.config.Setting; import org.neo4j.kernel.impl.store.format.standard.StandardV3_0; -import org.neo4j.test.rule.TargetDirectory; - -import java.io.File; -import java.util.HashMap; -import java.util.Map; -import java.util.function.IntFunction; +import org.neo4j.test.rule.TestDirectory; import static org.neo4j.helpers.collection.MapUtil.stringMap; public class ClusterRule extends ExternalResource { - private final TargetDirectory.TestDirectory testDirectory; + private final TestDirectory testDirectory; private File clusterDirectory; private Cluster cluster; @@ -54,7 +54,7 @@ public class ClusterRule extends ExternalResource public ClusterRule( Class testClass ) { - this.testDirectory = TargetDirectory.testDirForTest( testClass ); + this.testDirectory = TestDirectory.testDirectory( testClass ); } @Override @@ -119,7 +119,7 @@ public Cluster createCluster() throws Exception return cluster; } - public TargetDirectory.TestDirectory testDirectory() + public TestDirectory testDirectory() { return testDirectory; } diff --git a/enterprise/ha/src/test/java/jmx/JmxDocTest.java b/enterprise/ha/src/test/java/jmx/JmxDocTest.java index e84b5de77be68..784a9f728eb6b 100644 --- a/enterprise/ha/src/test/java/jmx/JmxDocTest.java +++ b/enterprise/ha/src/test/java/jmx/JmxDocTest.java @@ -55,7 +55,7 @@ import org.neo4j.kernel.configuration.docs.AsciiDocListGenerator; import org.neo4j.kernel.configuration.docs.SettingDescription; import org.neo4j.test.AsciiDocGenerator; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertEquals; @@ -79,7 +79,7 @@ public class JmxDocTest } }; @ClassRule - public static final TargetDirectory.TestDirectory test = TargetDirectory.testDirForTest( JmxDocTest.class ); + public static final TestDirectory test = TestDirectory.testDirectory(); private static GraphDatabaseService d1b; @BeforeClass diff --git a/enterprise/ha/src/test/java/org/neo4j/graphdb/factory/PlatformConstraintGraphDatabaseFactoryTest.java b/enterprise/ha/src/test/java/org/neo4j/graphdb/factory/PlatformConstraintGraphDatabaseFactoryTest.java index 8a79b7735362e..a48f66d76a26d 100644 --- a/enterprise/ha/src/test/java/org/neo4j/graphdb/factory/PlatformConstraintGraphDatabaseFactoryTest.java +++ b/enterprise/ha/src/test/java/org/neo4j/graphdb/factory/PlatformConstraintGraphDatabaseFactoryTest.java @@ -28,7 +28,7 @@ import org.neo4j.cluster.ClusterSettings; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.kernel.ha.factory.HighlyAvailableEditionModule; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -37,7 +37,7 @@ public class PlatformConstraintGraphDatabaseFactoryTest { @Rule - public TargetDirectory.TestDirectory storeDir = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory storeDir = TestDirectory.testDirectory(); private File workingDir; diff --git a/enterprise/ha/src/test/java/org/neo4j/ha/ForeignStoreIdIT.java b/enterprise/ha/src/test/java/org/neo4j/ha/ForeignStoreIdIT.java index 1de959c78636f..343d685c5fc48 100644 --- a/enterprise/ha/src/test/java/org/neo4j/ha/ForeignStoreIdIT.java +++ b/enterprise/ha/src/test/java/org/neo4j/ha/ForeignStoreIdIT.java @@ -30,7 +30,7 @@ import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.factory.EnterpriseGraphDatabaseFactory; import org.neo4j.graphdb.factory.TestHighlyAvailableGraphDatabaseFactory; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -43,7 +43,7 @@ public class ForeignStoreIdIT { @Rule - public final TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory testDirectory = TestDirectory.testDirectory(); private GraphDatabaseService firstInstance, foreignInstance; @After diff --git a/enterprise/ha/src/test/java/org/neo4j/ha/QuorumWritesIT.java b/enterprise/ha/src/test/java/org/neo4j/ha/QuorumWritesIT.java index 740b9362360da..2ee7dba14a214 100644 --- a/enterprise/ha/src/test/java/org/neo4j/ha/QuorumWritesIT.java +++ b/enterprise/ha/src/test/java/org/neo4j/ha/QuorumWritesIT.java @@ -45,7 +45,7 @@ import org.neo4j.kernel.impl.ha.ClusterManager.ManagedCluster; import org.neo4j.kernel.impl.store.StoreId; import org.neo4j.test.ha.ClusterRule; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -211,7 +211,7 @@ public void testInstanceCanBeReplacedToReestablishQuorum() throws Throwable } @Rule - public final TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory testDirectory = TestDirectory.testDirectory(); private void waitOnHeartbeatFail( HighlyAvailableGraphDatabase master, final CountDownLatch latch ) { diff --git a/enterprise/ha/src/test/java/org/neo4j/ha/TestBranchedData.java b/enterprise/ha/src/test/java/org/neo4j/ha/TestBranchedData.java index 163c225ee2f06..1f173930ca11f 100644 --- a/enterprise/ha/src/test/java/org/neo4j/ha/TestBranchedData.java +++ b/enterprise/ha/src/test/java/org/neo4j/ha/TestBranchedData.java @@ -50,8 +50,7 @@ import org.neo4j.kernel.impl.util.StoreUtil; import org.neo4j.kernel.lifecycle.LifeRule; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.TargetDirectory; -import org.neo4j.test.rule.TargetDirectory.TestDirectory; +import org.neo4j.test.rule.TestDirectory; import static java.lang.String.format; import static org.junit.Assert.assertFalse; @@ -63,7 +62,7 @@ public class TestBranchedData { private final LifeRule life = new LifeRule( true ); - private final TestDirectory directory = TargetDirectory.testDirForTest( getClass() ); + private final TestDirectory directory = TestDirectory.testDirectory(); @Rule public final RuleChain ruleChain = RuleChain.outerRule( directory ) diff --git a/enterprise/ha/src/test/java/org/neo4j/ha/TestPullUpdates.java b/enterprise/ha/src/test/java/org/neo4j/ha/TestPullUpdates.java index 476980bf1f4dd..24ef98db5bed4 100644 --- a/enterprise/ha/src/test/java/org/neo4j/ha/TestPullUpdates.java +++ b/enterprise/ha/src/test/java/org/neo4j/ha/TestPullUpdates.java @@ -55,7 +55,7 @@ import org.neo4j.shell.ShellException; import org.neo4j.shell.ShellLobby; import org.neo4j.shell.ShellSettings; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static java.lang.System.currentTimeMillis; import static org.hamcrest.Matchers.instanceOf; @@ -77,7 +77,7 @@ public class TestPullUpdates @Rule public final TestName testName = new TestName(); @Rule - public final TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory testDirectory = TestDirectory.testDirectory(); @After public void doAfter() throws Throwable diff --git a/enterprise/ha/src/test/java/org/neo4j/ha/TestPullUpdatesApplied.java b/enterprise/ha/src/test/java/org/neo4j/ha/TestPullUpdatesApplied.java index f93ba5ef05a23..eb3b75f4f9d73 100644 --- a/enterprise/ha/src/test/java/org/neo4j/ha/TestPullUpdatesApplied.java +++ b/enterprise/ha/src/test/java/org/neo4j/ha/TestPullUpdatesApplied.java @@ -45,7 +45,7 @@ import org.neo4j.kernel.ha.HighlyAvailableGraphDatabase; import org.neo4j.kernel.ha.UpdatePuller; import org.neo4j.test.StreamConsumer; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -67,7 +67,7 @@ public class TestPullUpdatesApplied { private final HighlyAvailableGraphDatabase[] dbs = new HighlyAvailableGraphDatabase[3]; @Rule - public final TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory testDirectory = TestDirectory.testDirectory(); @Before public void doBefore() throws Exception diff --git a/enterprise/ha/src/test/java/org/neo4j/ha/upgrade/RollingUpgradeIT.java b/enterprise/ha/src/test/java/org/neo4j/ha/upgrade/RollingUpgradeIT.java index 0e3286a04ee11..bc0436dcda575 100644 --- a/enterprise/ha/src/test/java/org/neo4j/ha/upgrade/RollingUpgradeIT.java +++ b/enterprise/ha/src/test/java/org/neo4j/ha/upgrade/RollingUpgradeIT.java @@ -54,7 +54,7 @@ import org.neo4j.kernel.ha.UpdatePuller; import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static java.util.concurrent.TimeUnit.MINUTES; import static org.junit.Assert.assertTrue; @@ -76,7 +76,7 @@ public class RollingUpgradeIT public static final RelationshipType type2 = RelationshipType.withName( "type2" ); @Rule - public TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory testDirectory = TestDirectory.testDirectory(); private LegacyDatabase[] legacyDbs; private GraphDatabaseAPI[] newDbs; diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/api/impl/labelscan/LabelScanStoreHaIT.java b/enterprise/ha/src/test/java/org/neo4j/kernel/api/impl/labelscan/LabelScanStoreHaIT.java index ccfde35ee2eb8..e1ddaa6d825a9 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/api/impl/labelscan/LabelScanStoreHaIT.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/api/impl/labelscan/LabelScanStoreHaIT.java @@ -36,7 +36,7 @@ import org.neo4j.kernel.impl.ha.ClusterManager.ManagedCluster; import org.neo4j.kernel.lifecycle.LifeSupport; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -99,7 +99,7 @@ private enum Labels implements Label } @Rule - public final TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory testDirectory = TestDirectory.testDirectory(); private final LifeSupport life = new LifeSupport(); private ManagedCluster cluster; private final TestMonitor monitor = new TestMonitor(); diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/ClusterFailoverIT.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/ClusterFailoverIT.java index 2efe688e3545f..8f18c69ee3f33 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/ClusterFailoverIT.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/ClusterFailoverIT.java @@ -32,7 +32,7 @@ import org.neo4j.ha.TestRunConditions; import org.neo4j.kernel.impl.ha.ClusterManager; import org.neo4j.test.rule.LoggerRule; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assume.assumeTrue; import static org.neo4j.helpers.collection.MapUtil.stringMap; @@ -43,7 +43,7 @@ public class ClusterFailoverIT @Rule public LoggerRule logger = new LoggerRule(); @Rule - public TargetDirectory.TestDirectory dir = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory dir = TestDirectory.testDirectory(); // parameters private int clusterSize; diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/ClusterPartitionIT.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/ClusterPartitionIT.java index a381be2dbe6c8..0ae2460911ae3 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/ClusterPartitionIT.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/ClusterPartitionIT.java @@ -19,10 +19,11 @@ */ package org.neo4j.kernel.ha; -import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import java.util.concurrent.CountDownLatch; + import org.neo4j.cluster.ClusterSettings; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; @@ -35,7 +36,7 @@ import org.neo4j.kernel.impl.ha.ClusterManager; import org.neo4j.kernel.impl.ha.ClusterManager.NetworkFlag; import org.neo4j.test.rule.LoggerRule; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -48,14 +49,12 @@ import static org.neo4j.kernel.impl.ha.ClusterManager.masterSeesSlavesAsAvailable; import static org.neo4j.kernel.impl.ha.ClusterManager.memberSeesOtherMemberAsFailed; -import java.util.concurrent.CountDownLatch; - public class ClusterPartitionIT { @Rule public LoggerRule logger = new LoggerRule(); @Rule - public TargetDirectory.TestDirectory dir = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory dir = TestDirectory.testDirectory(); private final String testPropKey = "testPropKey"; private final String testPropValue = "testPropValue"; diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/ConcurrentInstanceStartupIT.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/ConcurrentInstanceStartupIT.java index 358fe1f8ac21b..4ba8869a06cf8 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/ConcurrentInstanceStartupIT.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/ConcurrentInstanceStartupIT.java @@ -32,7 +32,7 @@ import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.factory.GraphDatabaseBuilder; import org.neo4j.graphdb.factory.TestHighlyAvailableGraphDatabaseFactory; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertTrue; @@ -40,7 +40,7 @@ public class ConcurrentInstanceStartupIT { public static final int INSTANCE_COUNT = 3; @Rule - public TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory testDirectory = TestDirectory.testDirectory(); @Test public void concurrentStartupShouldWork() throws Exception diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/ConflictingServerIdIT.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/ConflictingServerIdIT.java index cd8ae5df50e68..ee488e5fe547c 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/ConflictingServerIdIT.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/ConflictingServerIdIT.java @@ -28,7 +28,7 @@ import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.factory.GraphDatabaseBuilder; import org.neo4j.graphdb.factory.TestHighlyAvailableGraphDatabaseFactory; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -36,7 +36,7 @@ public class ConflictingServerIdIT { @Rule - public final TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory testDirectory = TestDirectory.testDirectory(); @Test public void testConflictingIdDoesNotSilentlyFail() throws Exception diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/FailoverWithAdditionalSlaveFailuresIT.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/FailoverWithAdditionalSlaveFailuresIT.java index 61d4a04259261..e0ba6409f22a4 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/FailoverWithAdditionalSlaveFailuresIT.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/FailoverWithAdditionalSlaveFailuresIT.java @@ -36,7 +36,7 @@ import org.neo4j.kernel.impl.ha.ClusterManager; import org.neo4j.kernel.impl.ha.ClusterManager.RepairKit; import org.neo4j.test.rule.LoggerRule; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assume.assumeTrue; import static org.neo4j.helpers.collection.MapUtil.stringMap; @@ -49,7 +49,7 @@ public class FailoverWithAdditionalSlaveFailuresIT @Rule public LoggerRule logger = new LoggerRule(); @Rule - public TargetDirectory.TestDirectory dir = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory dir = TestDirectory.testDirectory(); // parameters private int clusterSize; diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/HardKillIT.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/HardKillIT.java index 7cc5aa24059dc..f6184a00ae91f 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/HardKillIT.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/HardKillIT.java @@ -42,7 +42,7 @@ import org.neo4j.graphdb.factory.TestHighlyAvailableGraphDatabaseFactory; import org.neo4j.kernel.ha.cluster.modeswitch.HighAvailabilityModeSwitcher; import org.neo4j.test.ProcessStreamHandler; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static java.util.concurrent.TimeUnit.SECONDS; import static org.junit.Assert.assertEquals; @@ -52,7 +52,7 @@ public class HardKillIT { @Rule - public final TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory testDirectory = TestDirectory.testDirectory(); private ProcessStreamHandler processHandler; diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/SlaveUpgradeTest.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/SlaveUpgradeTest.java index dc597186e8ead..5ed8821539ec4 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/SlaveUpgradeTest.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/SlaveUpgradeTest.java @@ -29,7 +29,7 @@ import org.neo4j.helpers.Exceptions; import org.neo4j.kernel.impl.storemigration.MigrationTestUtils; import org.neo4j.kernel.impl.storemigration.UpgradeNotAllowedByConfigurationException; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.hamcrest.CoreMatchers.instanceOf; import static org.junit.Assert.assertThat; @@ -38,7 +38,7 @@ public class SlaveUpgradeTest { @Rule - public final TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory testDirectory = TestDirectory.testDirectory(); @Test public void haShouldFailToStartWithOldStore() throws Exception diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/internal/HaKernelDataTest.java b/enterprise/ha/src/test/java/org/neo4j/kernel/internal/HaKernelDataTest.java index e790a9f299722..40a7dcc0c1de0 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/internal/HaKernelDataTest.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/internal/HaKernelDataTest.java @@ -26,7 +26,7 @@ import org.neo4j.graphdb.factory.TestHighlyAvailableGraphDatabaseFactory; import org.neo4j.kernel.ha.HighlyAvailableGraphDatabase; import org.neo4j.test.ManagedResource; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertSame; @@ -47,7 +47,7 @@ public void shouldReturnHaGraphDbFromKernelData() throws Exception public final ManagedResource ha = new ManagedResource() { @Override - protected HighlyAvailableGraphDatabase createResource( TargetDirectory.TestDirectory dir ) throws Exception + protected HighlyAvailableGraphDatabase createResource( TestDirectory dir ) throws Exception { return (HighlyAvailableGraphDatabase) new TestHighlyAvailableGraphDatabaseFactory(). newEmbeddedDatabaseBuilder( dir.directory().getAbsoluteFile() ) diff --git a/enterprise/ha/src/test/java/org/neo4j/test/ManagedResource.java b/enterprise/ha/src/test/java/org/neo4j/test/ManagedResource.java index 1c03a0dcd0d1c..68837830bcd2d 100644 --- a/enterprise/ha/src/test/java/org/neo4j/test/ManagedResource.java +++ b/enterprise/ha/src/test/java/org/neo4j/test/ManagedResource.java @@ -23,7 +23,7 @@ import org.junit.runner.Description; import org.junit.runners.model.Statement; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; public abstract class ManagedResource implements TestRule { @@ -39,14 +39,14 @@ public final R getResource() return result; } - protected abstract R createResource( TargetDirectory.TestDirectory dir ) throws Exception; + protected abstract R createResource( TestDirectory dir ) throws Exception; protected abstract void disposeResource( R resource ); @Override public final Statement apply( final Statement base, Description description ) { - final TargetDirectory.TestDirectory dir = TargetDirectory.testDirForTest( description.getTestClass() ); + final TestDirectory dir = TestDirectory.testDirectory( description.getTestClass() ); return dir.apply( new Statement() { @Override diff --git a/enterprise/ha/src/test/java/org/neo4j/test/ha/ClusterRule.java b/enterprise/ha/src/test/java/org/neo4j/test/ha/ClusterRule.java index f0c46d08775ad..903fe1e38a710 100644 --- a/enterprise/ha/src/test/java/org/neo4j/test/ha/ClusterRule.java +++ b/enterprise/ha/src/test/java/org/neo4j/test/ha/ClusterRule.java @@ -43,7 +43,7 @@ import org.neo4j.kernel.impl.ha.ClusterManager.ManagedCluster; import org.neo4j.kernel.impl.ha.ClusterManager.StoreDirInitializer; import org.neo4j.kernel.impl.util.Listener; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.neo4j.cluster.ClusterSettings.default_timeout; import static org.neo4j.graphdb.factory.GraphDatabaseSettings.pagecache_memory; @@ -78,12 +78,12 @@ public void initializeStoreDir( int serverId, File storeDir ) throws IOException private ClusterManager clusterManager; private File storeDirectory; - private final TargetDirectory.TestDirectory testDirectory; + private final TestDirectory testDirectory; private ManagedCluster cluster; public ClusterRule( Class testClass ) { - this.testDirectory = TargetDirectory.testDirForTest( testClass ); + this.testDirectory = TestDirectory.testDirectory( testClass ); this.clusterManagerBuilder = new ClusterManager.Builder() .withSharedSetting( store_internal_log_level, "DEBUG" ) .withSharedSetting( default_timeout, "1s" ) diff --git a/enterprise/ha/src/test/java/org/neo4j/test/ha/ClusterTest.java b/enterprise/ha/src/test/java/org/neo4j/test/ha/ClusterTest.java index 80c690dd0b888..90a37ce6126b0 100644 --- a/enterprise/ha/src/test/java/org/neo4j/test/ha/ClusterTest.java +++ b/enterprise/ha/src/test/java/org/neo4j/test/ha/ClusterTest.java @@ -45,12 +45,12 @@ import org.neo4j.kernel.ha.HaSettings; import org.neo4j.kernel.ha.HighlyAvailableGraphDatabase; import org.neo4j.kernel.impl.ha.ClusterManager; -import org.neo4j.test.rule.LoggerRule; -import org.neo4j.test.rule.TargetDirectory; import org.neo4j.kernel.impl.store.MetaDataStore; import org.neo4j.kernel.impl.store.TransactionId; import org.neo4j.kernel.impl.storemigration.LogFiles; import org.neo4j.kernel.impl.transaction.log.TransactionIdStore; +import org.neo4j.test.rule.LoggerRule; +import org.neo4j.test.rule.TestDirectory; import static org.hamcrest.Matchers.instanceOf; import static org.junit.Assert.assertEquals; @@ -72,7 +72,7 @@ public class ClusterTest @Rule public LoggerRule logging = new LoggerRule( Level.OFF ); @Rule - public TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory testDirectory = TestDirectory.testDirectory(); @Test public void testCluster() throws Throwable diff --git a/enterprise/ha/src/test/java/slavetest/TestInstanceJoin.java b/enterprise/ha/src/test/java/slavetest/TestInstanceJoin.java index baea960634095..478eda2b5c264 100644 --- a/enterprise/ha/src/test/java/slavetest/TestInstanceJoin.java +++ b/enterprise/ha/src/test/java/slavetest/TestInstanceJoin.java @@ -36,7 +36,7 @@ import org.neo4j.kernel.impl.transaction.log.checkpoint.CheckPointer; import org.neo4j.kernel.impl.transaction.log.checkpoint.SimpleTriggerInfo; import org.neo4j.kernel.impl.transaction.log.rotation.LogRotation; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertEquals; import static org.neo4j.graphdb.factory.GraphDatabaseSettings.keep_logical_logs; @@ -49,7 +49,7 @@ public class TestInstanceJoin { @Rule - public final TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory testDirectory = TestDirectory.testDirectory(); @Test public void makeSureSlaveCanJoinEvenIfTooFarBackComparedToMaster() throws Exception diff --git a/enterprise/kernel/src/test/java/org/neo4j/graphdb/StartupConstraintSemanticsTest.java b/enterprise/kernel/src/test/java/org/neo4j/graphdb/StartupConstraintSemanticsTest.java index b2a26b8258de0..d42c7257394c1 100644 --- a/enterprise/kernel/src/test/java/org/neo4j/graphdb/StartupConstraintSemanticsTest.java +++ b/enterprise/kernel/src/test/java/org/neo4j/graphdb/StartupConstraintSemanticsTest.java @@ -26,18 +26,17 @@ import org.neo4j.graphdb.factory.GraphDatabaseFactory; import org.neo4j.helpers.Exceptions; import org.neo4j.kernel.impl.constraints.StandardConstraintSemantics; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.hamcrest.Matchers.instanceOf; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; -import static org.neo4j.test.rule.TargetDirectory.testDirForTest; public class StartupConstraintSemanticsTest { @Rule - public final TargetDirectory.TestDirectory dir = testDirForTest( StartupConstraintSemanticsTest.class ); + public final TestDirectory dir = TestDirectory.testDirectory(); @Test public void shouldNotAllowOpeningADatabaseWithPECInCommunityEdition() throws Exception diff --git a/enterprise/kernel/src/test/java/org/neo4j/shell/EnterpriseVersionTest.java b/enterprise/kernel/src/test/java/org/neo4j/shell/EnterpriseVersionTest.java index 8b5bb4c46b789..f33bc9632e768 100644 --- a/enterprise/kernel/src/test/java/org/neo4j/shell/EnterpriseVersionTest.java +++ b/enterprise/kernel/src/test/java/org/neo4j/shell/EnterpriseVersionTest.java @@ -25,19 +25,18 @@ import java.io.ByteArrayOutputStream; import java.io.PrintStream; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.startsWith; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; import static org.mockito.Mockito.mock; -import static org.neo4j.test.rule.TargetDirectory.testDirForTest; public class EnterpriseVersionTest { @Rule - public final TargetDirectory.TestDirectory dir = testDirForTest( EnterpriseVersionTest.class ); + public final TestDirectory dir = TestDirectory.testDirectory(); @Test public void shouldPrintVersionAndExit() throws Exception diff --git a/enterprise/metrics/src/test/java/org/neo4j/metrics/output/CsvOutputTest.java b/enterprise/metrics/src/test/java/org/neo4j/metrics/output/CsvOutputTest.java index 925d900524712..72d864fa3ce64 100644 --- a/enterprise/metrics/src/test/java/org/neo4j/metrics/output/CsvOutputTest.java +++ b/enterprise/metrics/src/test/java/org/neo4j/metrics/output/CsvOutputTest.java @@ -19,14 +19,14 @@ */ package org.neo4j.metrics.output; -import java.io.File; -import java.nio.file.Files; - import com.codahale.metrics.MetricRegistry; import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import java.io.File; +import java.nio.file.Files; + import org.neo4j.graphdb.factory.GraphDatabaseSettings; import org.neo4j.io.fs.DefaultFileSystemAbstraction; import org.neo4j.kernel.configuration.Config; @@ -37,13 +37,11 @@ import org.neo4j.kernel.lifecycle.LifeRule; import org.neo4j.logging.NullLog; import org.neo4j.metrics.MetricsSettings; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static java.lang.System.currentTimeMillis; import static java.util.concurrent.TimeUnit.SECONDS; - import static org.junit.Assert.fail; - import static org.neo4j.helpers.collection.MapUtil.stringMap; public class CsvOutputTest @@ -51,7 +49,7 @@ public class CsvOutputTest @Rule public final LifeRule life = new LifeRule(); @Rule - public final TargetDirectory.TestDirectory directory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory directory = TestDirectory.testDirectory(); private KernelContext kernelContext; diff --git a/enterprise/neo4j-enterprise/src/test/java/org/neo4j/consistency/ConsistencyCheckServiceRecordFormatIT.java b/enterprise/neo4j-enterprise/src/test/java/org/neo4j/consistency/ConsistencyCheckServiceRecordFormatIT.java index d7937958609d2..0c8070add9769 100644 --- a/enterprise/neo4j-enterprise/src/test/java/org/neo4j/consistency/ConsistencyCheckServiceRecordFormatIT.java +++ b/enterprise/neo4j-enterprise/src/test/java/org/neo4j/consistency/ConsistencyCheckServiceRecordFormatIT.java @@ -48,17 +48,15 @@ import org.neo4j.logging.FormattedLogProvider; import org.neo4j.test.rule.EmbeddedDatabaseRule; import org.neo4j.test.rule.SuppressOutput; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertTrue; -import static org.neo4j.test.rule.TargetDirectory.testDirForTest; @RunWith( Parameterized.class ) public class ConsistencyCheckServiceRecordFormatIT { @ClassRule - public static final TargetDirectory.TestDirectory dir = - testDirForTest( ConsistencyCheckServiceRecordFormatIT.class ); + public static final TestDirectory dir = TestDirectory.testDirectory(); private final File storeDir = dir.directory( "db" ); private final EmbeddedDatabaseRule db = new EmbeddedDatabaseRule( storeDir ).startLazily(); diff --git a/enterprise/neo4j-enterprise/src/test/java/org/neo4j/unsafe/batchinsert/BatchInsertEnterpriseTest.java b/enterprise/neo4j-enterprise/src/test/java/org/neo4j/unsafe/batchinsert/BatchInsertEnterpriseTest.java index 47aa507fcca9f..4aa96ce7928a7 100644 --- a/enterprise/neo4j-enterprise/src/test/java/org/neo4j/unsafe/batchinsert/BatchInsertEnterpriseTest.java +++ b/enterprise/neo4j-enterprise/src/test/java/org/neo4j/unsafe/batchinsert/BatchInsertEnterpriseTest.java @@ -43,10 +43,9 @@ import org.neo4j.kernel.impl.MyRelTypes; import org.neo4j.kernel.impl.store.format.highlimit.HighLimit; import org.neo4j.kernel.impl.store.format.standard.StandardV3_0; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertEquals; - import static org.neo4j.helpers.collection.Iterables.single; import static org.neo4j.helpers.collection.MapUtil.map; import static org.neo4j.helpers.collection.MapUtil.stringMap; @@ -59,7 +58,7 @@ public class BatchInsertEnterpriseTest { @Rule - public final TargetDirectory.TestDirectory directory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory directory = TestDirectory.testDirectory(); @Parameter public String recordFormat; diff --git a/enterprise/neo4j-enterprise/src/test/java/upgrade/RecordFormatsMigrationIT.java b/enterprise/neo4j-enterprise/src/test/java/upgrade/RecordFormatsMigrationIT.java index 23667cff4074a..d99a27baa9d5c 100644 --- a/enterprise/neo4j-enterprise/src/test/java/upgrade/RecordFormatsMigrationIT.java +++ b/enterprise/neo4j-enterprise/src/test/java/upgrade/RecordFormatsMigrationIT.java @@ -44,7 +44,7 @@ import org.neo4j.kernel.impl.store.format.standard.StandardV3_0; import org.neo4j.kernel.impl.storemigration.StoreUpgrader.UnexpectedUpgradingStoreFormatException; import org.neo4j.logging.NullLogProvider; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.hamcrest.Matchers.instanceOf; import static org.junit.Assert.assertEquals; @@ -52,7 +52,6 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; import static org.neo4j.helpers.collection.MapUtil.stringMap; -import static org.neo4j.test.rule.TargetDirectory.testDirForTest; public class RecordFormatsMigrationIT { @@ -63,7 +62,7 @@ public class RecordFormatsMigrationIT private final FileSystemAbstraction fs = new DefaultFileSystemAbstraction(); @Rule - public final TargetDirectory.TestDirectory testDir = testDirForTest( RecordFormatsMigrationIT.class, fs ); + public final TestDirectory testDir = TestDirectory.testDirectory( fs ); @Test public void migrateStandardToHighLimit() throws IOException diff --git a/enterprise/neo4j-enterprise/src/test/java/upgrade/StoreMigratorFrom20IT.java b/enterprise/neo4j-enterprise/src/test/java/upgrade/StoreMigratorFrom20IT.java index f5682da70ede3..7fa03b6404336 100644 --- a/enterprise/neo4j-enterprise/src/test/java/upgrade/StoreMigratorFrom20IT.java +++ b/enterprise/neo4j-enterprise/src/test/java/upgrade/StoreMigratorFrom20IT.java @@ -68,22 +68,21 @@ import org.neo4j.logging.LogProvider; import org.neo4j.logging.NullLogProvider; import org.neo4j.test.rule.PageCacheRule; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static upgrade.StoreMigratorTestUtil.buildClusterWithMasterDirIn; - import static org.neo4j.consistency.store.StoreAssertions.assertConsistentStore; import static org.neo4j.helpers.collection.MapUtil.stringMap; import static org.neo4j.kernel.impl.ha.ClusterManager.allSeesAllAsAvailable; import static org.neo4j.kernel.impl.storemigration.MigrationTestUtils.find20FormatStoreDirectory; +import static upgrade.StoreMigratorTestUtil.buildClusterWithMasterDirIn; @RunWith( Parameterized.class ) public class StoreMigratorFrom20IT { @Rule - public final TargetDirectory.TestDirectory storeDir = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory storeDir = TestDirectory.testDirectory(); @Rule public final PageCacheRule pageCacheRule = new PageCacheRule(); diff --git a/enterprise/neo4j-enterprise/src/test/java/upgrade/StoreMigratorFrom21IT.java b/enterprise/neo4j-enterprise/src/test/java/upgrade/StoreMigratorFrom21IT.java index 5d0bdc3f98fe0..6e5f90b092e2e 100644 --- a/enterprise/neo4j-enterprise/src/test/java/upgrade/StoreMigratorFrom21IT.java +++ b/enterprise/neo4j-enterprise/src/test/java/upgrade/StoreMigratorFrom21IT.java @@ -48,7 +48,7 @@ import org.neo4j.kernel.impl.storemigration.MigrationTestUtils; import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.logging.NullLogProvider; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -58,7 +58,7 @@ public class StoreMigratorFrom21IT { @Rule - public final TargetDirectory.TestDirectory storeDir = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory storeDir = TestDirectory.testDirectory(); @Test public void mustMendDuplicatePropertiesWhenUpgradingFromVersion21() throws Exception diff --git a/enterprise/neo4j-harness-enterprise/src/test/java/org/neo4j/harness/internal/EnterpriseInProcessServerBuilderTest.java b/enterprise/neo4j-harness-enterprise/src/test/java/org/neo4j/harness/internal/EnterpriseInProcessServerBuilderTest.java index 3c17fc17c69d7..fb8ceacd55157 100644 --- a/enterprise/neo4j-harness-enterprise/src/test/java/org/neo4j/harness/internal/EnterpriseInProcessServerBuilderTest.java +++ b/enterprise/neo4j-harness-enterprise/src/test/java/org/neo4j/harness/internal/EnterpriseInProcessServerBuilderTest.java @@ -31,7 +31,7 @@ import org.neo4j.server.ServerTestUtils; import org.neo4j.server.configuration.ServerSettings; import org.neo4j.test.rule.SuppressOutput; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import org.neo4j.test.server.HTTP; import static org.hamcrest.CoreMatchers.equalTo; @@ -40,7 +40,7 @@ public class EnterpriseInProcessServerBuilderTest { @Rule - public TargetDirectory.TestDirectory testDir = TargetDirectory.testDirForTest( EnterpriseInProcessServerBuilderTest.class ); + public TestDirectory testDir = TestDirectory.testDirectory(); @Rule public SuppressOutput suppressOutput = SuppressOutput.suppressAll(); 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 8f847c791d86d..898df26d16aaf 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 @@ -43,7 +43,7 @@ import org.neo4j.kernel.configuration.Settings; import org.neo4j.logging.AssertableLogProvider; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import org.neo4j.test.rule.fs.EphemeralFileSystemRule; import static org.hamcrest.Matchers.endsWith; @@ -57,7 +57,7 @@ public class QueryLoggerIT @Rule public final EphemeralFileSystemRule fileSystem = new EphemeralFileSystemRule(); @Rule - public final TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory testDirectory = TestDirectory.testDirectory(); private AssertableLogProvider inMemoryLog; private GraphDatabaseBuilder databaseBuilder; public static final String QUERY = "CREATE (n:Foo{bar:\"baz\"})"; diff --git a/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/ArbiterBootstrapperIT.java b/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/ArbiterBootstrapperIT.java index 85bad77806cc6..febe0a6faa917 100644 --- a/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/ArbiterBootstrapperIT.java +++ b/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/ArbiterBootstrapperIT.java @@ -55,7 +55,7 @@ import org.neo4j.server.enterprise.functional.DumpPortListenerOnNettyBindFailure; import org.neo4j.test.InputStreamAwaiter; import org.neo4j.test.ProcessStreamHandler; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static java.lang.Runtime.getRuntime; import static java.lang.String.format; @@ -126,7 +126,7 @@ public void usesPortRange() throws Exception @Rule public TestRule dumpPorts = new DumpPortListenerOnNettyBindFailure(); @Rule - public TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory testDirectory = TestDirectory.testDirectory(); private File directory; private LifeSupport life; diff --git a/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/StandaloneHaInfoFunctionalTest.java b/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/StandaloneHaInfoFunctionalTest.java index c31b600412609..a96848b17969e 100644 --- a/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/StandaloneHaInfoFunctionalTest.java +++ b/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/StandaloneHaInfoFunctionalTest.java @@ -31,7 +31,7 @@ import org.neo4j.server.rest.JaxRsResponse; import org.neo4j.server.rest.RestRequest; import org.neo4j.server.rest.domain.JsonHelper; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN; import static org.junit.Assert.assertEquals; @@ -45,7 +45,7 @@ public class StandaloneHaInfoFunctionalTest private static EnterpriseNeoServer server; @Rule - public TargetDirectory.TestDirectory target = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory target = TestDirectory.testDirectory(); @Before public void before() throws IOException diff --git a/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/jmx/ServerManagementTest.java b/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/jmx/ServerManagementTest.java index 58e264581556d..b1ca404c57cdd 100644 --- a/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/jmx/ServerManagementTest.java +++ b/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/jmx/ServerManagementTest.java @@ -36,7 +36,7 @@ import org.neo4j.server.enterprise.EnterpriseNeoServer; import org.neo4j.server.enterprise.helpers.EnterpriseServerBuilder; import org.neo4j.test.rule.CleanupRule; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -47,7 +47,7 @@ public class ServerManagementTest { private final CleanupRule cleanup = new CleanupRule(); - private final TargetDirectory.TestDirectory baseDir = TargetDirectory.testDirForTest( getClass() ); + private final TestDirectory baseDir = TestDirectory.testDirectory(); @Rule public RuleChain ruleChain = RuleChain.outerRule( baseDir ) diff --git a/integrationtests/src/test/java/org/neo4j/ext/udc/impl/UdcExtensionImplTest.java b/integrationtests/src/test/java/org/neo4j/ext/udc/impl/UdcExtensionImplTest.java index d16a58f4d15c3..a937ba73a9bd4 100644 --- a/integrationtests/src/test/java/org/neo4j/ext/udc/impl/UdcExtensionImplTest.java +++ b/integrationtests/src/test/java/org/neo4j/ext/udc/impl/UdcExtensionImplTest.java @@ -52,7 +52,7 @@ import org.neo4j.test.TestEnterpriseGraphDatabaseFactory; import org.neo4j.test.TestGraphDatabaseFactory; import org.neo4j.test.mockito.matcher.RegexMatcher; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import org.neo4j.udc.UsageData; import org.neo4j.udc.UsageDataKeys; @@ -86,7 +86,7 @@ public class UdcExtensionImplTest private static final String VersionPattern = "(\\d\\.\\d+((\\.|\\-).*)?)|(dev)"; @Rule - public TargetDirectory.TestDirectory path = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory path = TestDirectory.testDirectory(); private PingerHandler handler; private Map config; diff --git a/integrationtests/src/test/java/org/neo4j/ha/HAClusterStartupIT.java b/integrationtests/src/test/java/org/neo4j/ha/HAClusterStartupIT.java index 556fe7871346c..4bf1d8dfcb106 100644 --- a/integrationtests/src/test/java/org/neo4j/ha/HAClusterStartupIT.java +++ b/integrationtests/src/test/java/org/neo4j/ha/HAClusterStartupIT.java @@ -33,8 +33,7 @@ import org.neo4j.kernel.ha.HighlyAvailableGraphDatabase; import org.neo4j.kernel.impl.ha.ClusterManager; import org.neo4j.kernel.impl.storemigration.LogFiles; -import org.neo4j.test.rule.TargetDirectory; -import org.neo4j.test.rule.TargetDirectory.TestDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.neo4j.consistency.store.StoreAssertions.assertConsistentStore; import static org.neo4j.kernel.impl.ha.ClusterManager.allSeesAllAsAvailable; @@ -43,7 +42,7 @@ public class HAClusterStartupIT { @Rule - public final TestDirectory dir = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory dir = TestDirectory.testDirectory(); private Cluster cluster; private ClusterManager clusterManager; diff --git a/integrationtests/src/test/java/org/neo4j/storeupgrade/LegacyIndexesUpgradeTest.java b/integrationtests/src/test/java/org/neo4j/storeupgrade/LegacyIndexesUpgradeTest.java index 230bb8791c072..a938f82549fc4 100644 --- a/integrationtests/src/test/java/org/neo4j/storeupgrade/LegacyIndexesUpgradeTest.java +++ b/integrationtests/src/test/java/org/neo4j/storeupgrade/LegacyIndexesUpgradeTest.java @@ -46,7 +46,7 @@ import org.neo4j.test.TestGraphDatabaseFactory; import org.neo4j.test.Unzip; import org.neo4j.test.rule.SuppressOutput; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -57,7 +57,7 @@ public class LegacyIndexesUpgradeTest { @Rule - public TargetDirectory.TestDirectory testDir = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory testDir = TestDirectory.testDirectory(); @Rule public ExpectedException expectedException = ExpectedException.none(); diff --git a/integrationtests/src/test/java/org/neo4j/storeupgrade/StoreUpgradeIntegrationTest.java b/integrationtests/src/test/java/org/neo4j/storeupgrade/StoreUpgradeIntegrationTest.java index 10a400b201782..a6880c2fd7cef 100644 --- a/integrationtests/src/test/java/org/neo4j/storeupgrade/StoreUpgradeIntegrationTest.java +++ b/integrationtests/src/test/java/org/neo4j/storeupgrade/StoreUpgradeIntegrationTest.java @@ -74,7 +74,7 @@ import org.neo4j.test.TestGraphDatabaseFactory; import org.neo4j.test.Unzip; import org.neo4j.test.rule.SuppressOutput; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertEquals; @@ -161,7 +161,7 @@ public static Collection stores() @Rule public SuppressOutput suppressOutput = SuppressOutput.suppressAll(); @Rule - public TargetDirectory.TestDirectory testDir = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory testDir = TestDirectory.testDirectory(); @Test public void embeddedDatabaseShouldStartOnOlderStoreWhenUpgradeIsEnabled() throws Throwable @@ -280,7 +280,7 @@ public void migratingOlderDataAndThanStartAClusterUsingTheNewerDataShouldWork() public static class StoreUpgradeFailingTest { @Rule - public TargetDirectory.TestDirectory testDir = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory testDir = TestDirectory.testDirectory(); @Parameterized.Parameter(0) public String ignored; // to make JUnit happy... @@ -334,7 +334,7 @@ public static Collection stores() } @Rule - public TargetDirectory.TestDirectory testDir = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory testDir = TestDirectory.testDirectory(); @Test public void shouldBeAbleToUpgradeAStoreWithoutIdFilesAsBackups() throws Throwable diff --git a/manual/embedded-examples/src/test/java/org/neo4j/examples/GetOrCreateDocIT.java b/manual/embedded-examples/src/test/java/org/neo4j/examples/GetOrCreateDocIT.java index b5141291d4b92..c19e49ec44c90 100644 --- a/manual/embedded-examples/src/test/java/org/neo4j/examples/GetOrCreateDocIT.java +++ b/manual/embedded-examples/src/test/java/org/neo4j/examples/GetOrCreateDocIT.java @@ -36,7 +36,7 @@ import org.neo4j.graphdb.index.Index; import org.neo4j.graphdb.index.UniqueFactory; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static java.lang.String.format; import static org.junit.Assert.assertEquals; @@ -45,8 +45,7 @@ public class GetOrCreateDocIT extends AbstractJavaDocTestBase { @ClassRule - public static TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( GetOrCreateDocIT - .class ); + public static TestDirectory testDirectory = TestDirectory.testDirectory(); @BeforeClass public static void init() diff --git a/manual/embedded-examples/src/test/java/org/neo4j/examples/StartWithConfigurationDocTest.java b/manual/embedded-examples/src/test/java/org/neo4j/examples/StartWithConfigurationDocTest.java index 7bc3464c30734..71bf602606f55 100644 --- a/manual/embedded-examples/src/test/java/org/neo4j/examples/StartWithConfigurationDocTest.java +++ b/manual/embedded-examples/src/test/java/org/neo4j/examples/StartWithConfigurationDocTest.java @@ -24,14 +24,14 @@ import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.factory.GraphDatabaseFactory; import org.neo4j.graphdb.factory.GraphDatabaseSettings; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertNotNull; public class StartWithConfigurationDocTest { @Rule - public TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory testDirectory = TestDirectory.testDirectory(); @Test public void loadFromFile() diff --git a/manual/import-tool/src/test/java/org/neo4j/tooling/ImportToolDocIT.java b/manual/import-tool/src/test/java/org/neo4j/tooling/ImportToolDocIT.java index d32488a104a08..dcf3326d724c4 100644 --- a/manual/import-tool/src/test/java/org/neo4j/tooling/ImportToolDocIT.java +++ b/manual/import-tool/src/test/java/org/neo4j/tooling/ImportToolDocIT.java @@ -43,8 +43,7 @@ import org.neo4j.graphdb.Transaction; import org.neo4j.helpers.collection.Iterables; import org.neo4j.test.TestGraphDatabaseFactory; -import org.neo4j.test.rule.TargetDirectory; -import org.neo4j.test.rule.TargetDirectory.TestDirectory; +import org.neo4j.test.rule.TestDirectory; import org.neo4j.tooling.ImportTool.Options; import org.neo4j.unsafe.impl.batchimport.Configuration; @@ -59,7 +58,7 @@ public class ImportToolDocIT { @Rule - public final TestDirectory directory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory directory = TestDirectory.testDirectory(); private static final int NODE_COUNT = 6; private static final int RELATIONSHIP_COUNT = 9; 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 aba4bb3c5350e..81eb8969599ef 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 @@ -31,7 +31,7 @@ import org.neo4j.desktop.Parameters; import org.neo4j.desktop.config.Installation; import org.neo4j.desktop.model.DesktopModel; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; @@ -41,7 +41,7 @@ public class DatabaseActionsTest { @Rule - public TargetDirectory.TestDirectory baseDir = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory testDirectory = TestDirectory.testDirectory(); private File storeDir; private File configFile; @@ -76,10 +76,10 @@ public void shouldCreateMessagesLogBelowStoreDir() throws Exception @Before public void createFiles() throws IOException { - storeDir = new File( baseDir.directory(), "store_dir" ); + storeDir = new File( testDirectory.directory(), "store_dir" ); storeDir.mkdirs(); - configFile = new File( baseDir.directory(), "neo4j.conf" ); + configFile = new File( testDirectory.directory(), "neo4j.conf" ); Properties props = new Properties(); props.setProperty( httpConnector( "1" ).type.name(), "HTTP" ); props.setProperty( httpConnector( "1" ).enabled.name(), "true" ); diff --git a/tools/src/test/java/org/neo4j/tools/applytx/DatabaseRebuildToolTest.java b/tools/src/test/java/org/neo4j/tools/applytx/DatabaseRebuildToolTest.java index 6ab5f294293c8..2777d81c2f530 100644 --- a/tools/src/test/java/org/neo4j/tools/applytx/DatabaseRebuildToolTest.java +++ b/tools/src/test/java/org/neo4j/tools/applytx/DatabaseRebuildToolTest.java @@ -40,7 +40,7 @@ import org.neo4j.kernel.impl.transaction.log.TransactionIdStore; import org.neo4j.test.DbRepresentation; import org.neo4j.test.rule.SuppressOutput; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static java.lang.String.format; import static org.hamcrest.Matchers.containsString; @@ -56,7 +56,7 @@ public class DatabaseRebuildToolTest @Rule public final SuppressOutput suppressOutput = SuppressOutput.suppressAll(); @Rule - public final TargetDirectory.TestDirectory directory = TargetDirectory.testDirForTest( getClass() ); + public final TestDirectory directory = TestDirectory.testDirectory(); @Test public void shouldRebuildDbFromTransactions() throws Exception diff --git a/tools/src/test/java/org/neo4j/tools/migration/StoreMigrationTest.java b/tools/src/test/java/org/neo4j/tools/migration/StoreMigrationTest.java index b046a2b164508..5ea0f0a77c1d3 100644 --- a/tools/src/test/java/org/neo4j/tools/migration/StoreMigrationTest.java +++ b/tools/src/test/java/org/neo4j/tools/migration/StoreMigrationTest.java @@ -31,14 +31,14 @@ import org.neo4j.test.TestGraphDatabaseFactory; import org.neo4j.test.Unzip; import org.neo4j.test.rule.SuppressOutput; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; public class StoreMigrationTest { @Rule public final SuppressOutput mute = SuppressOutput.suppressAll(); @Rule - public TargetDirectory.TestDirectory testDir = TargetDirectory.testDirForTest( getClass() ); + public TestDirectory testDir = TestDirectory.testDirectory(); @Before public void setUp() throws IOException diff --git a/tools/src/test/java/org/neo4j/tools/rebuild/RebuildFromLogsTest.java b/tools/src/test/java/org/neo4j/tools/rebuild/RebuildFromLogsTest.java index f47fb7f0e7b65..384d6af712832 100644 --- a/tools/src/test/java/org/neo4j/tools/rebuild/RebuildFromLogsTest.java +++ b/tools/src/test/java/org/neo4j/tools/rebuild/RebuildFromLogsTest.java @@ -43,17 +43,16 @@ import org.neo4j.test.DbRepresentation; import org.neo4j.test.TestGraphDatabaseFactory; import org.neo4j.test.rule.SuppressOutput; -import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TestDirectory; import static org.junit.Assert.assertEquals; import static org.neo4j.kernel.impl.transaction.log.TransactionIdStore.BASE_TX_ID; -import static org.neo4j.test.rule.TargetDirectory.testDirForTest; @RunWith(Parameterized.class) public class RebuildFromLogsTest { @Rule - public final TargetDirectory.TestDirectory dir = testDirForTest( RebuildFromLogsTest.class ); + public final TestDirectory dir = TestDirectory.testDirectory(); @Rule public SuppressOutput suppressOutput = SuppressOutput.suppressAll();