Reorganisation of kernel test rules, matchers and answers.

Gather available custom test rules, matchers, answers and mocks
together in new packages in org.neo4j.test.*.*
to extend usage, awareness and reusability.
Remove some duplicated rules.

community/consistency-check/src/test/java/org/neo4j/consistency/ConsistencyCheckServiceIntegrationTest.java

@@ -48,8 +48,8 @@
 import org.neo4j.kernel.impl.factory.GraphDatabaseFacadeFactory;
 import org.neo4j.kernel.impl.store.record.NodeRecord;
 import org.neo4j.logging.NullLogProvider;
-import org.neo4j.test.TargetDirectory;
 import org.neo4j.test.TestGraphDatabaseFactory;
+import org.neo4j.test.rule.TargetDirectory;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;

community/consistency-check/src/test/java/org/neo4j/consistency/ConsistencyCheckToolTest.java

@@ -38,10 +38,10 @@
 import org.neo4j.io.fs.FileSystemAbstraction;
 import org.neo4j.kernel.configuration.Config;
 import org.neo4j.logging.LogProvider;
-import org.neo4j.test.EphemeralFileSystemRule;
-import org.neo4j.test.SystemExitRule;
-import org.neo4j.test.TargetDirectory;
 import org.neo4j.test.TestGraphDatabaseFactory;
+import org.neo4j.test.rule.TargetDirectory;
+import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule;
+import org.neo4j.test.rule.system.SystemExitRule;
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.instanceOf;
@@ -56,7 +56,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.neo4j.graphdb.Label.label;
-import static org.neo4j.test.EphemeralFileSystemRule.shutdownDbAction;
+import static org.neo4j.test.rule.filesystem.EphemeralFileSystemRule.shutdownDbAction;
 
 public class ConsistencyCheckToolTest
 {

community/consistency-check/src/test/java/org/neo4j/consistency/checking/GraphStoreFixture.java

@@ -77,9 +77,9 @@
 import org.neo4j.storageengine.api.StorageEngine;
 import org.neo4j.storageengine.api.TransactionApplicationMode;
 import org.neo4j.storageengine.api.schema.SchemaRule;
-import org.neo4j.test.PageCacheRule;
-import org.neo4j.test.TargetDirectory;
 import org.neo4j.test.TestGraphDatabaseFactory;
+import org.neo4j.test.rule.PageCacheRule;
+import org.neo4j.test.rule.TargetDirectory;
 
 import static java.lang.System.currentTimeMillis;
 import static org.neo4j.consistency.ConsistencyCheckService.defaultConsistencyCheckThreadsNumber;

community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/DetectAllRelationshipInconsistenciesIT.java

@@ -53,8 +53,8 @@
 import org.neo4j.kernel.internal.GraphDatabaseAPI;
 import org.neo4j.logging.AssertableLogProvider;
 import org.neo4j.logging.NullLogProvider;
-import org.neo4j.test.RandomRule;
-import org.neo4j.test.TargetDirectory;
+import org.neo4j.test.rule.RandomRule;
+import org.neo4j.test.rule.TargetDirectory;
 
 import static org.junit.Assert.assertTrue;
 import static org.neo4j.graphdb.Label.label;

community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/FullCheckIntegrationTest.java

@@ -109,7 +109,7 @@
 import org.neo4j.logging.FormattedLog;
 import org.neo4j.storageengine.api.schema.SchemaRule;
 import org.neo4j.string.UTF8;
-import org.neo4j.test.FailureOutput;
+import org.neo4j.test.rule.SuppressOutput;
 
 import static java.lang.String.format;
 import static java.util.Arrays.asList;
@@ -246,10 +246,11 @@ protected void generateInitialData( GraphDatabaseService db )
             }
         }
     };
-    private final FailureOutput failureOutput = new FailureOutput();
+
+    private final SuppressOutput suppressOutput = SuppressOutput.suppress( SuppressOutput.System.out );
 
     @Rule
-    public RuleChain ruleChain = RuleChain.outerRule( failureOutput ).around( fixture );
+    public RuleChain ruleChain = RuleChain.outerRule( suppressOutput ).around( fixture );
 
     @Test
     public void shouldCheckConsistencyOfAConsistentStore() throws Exception
@@ -1980,7 +1981,7 @@ private ConsistencySummaryStatistics check( DirectStoreAccess stores ) throws Co
         Config config = config();
         FullCheck checker = new FullCheck( config, ProgressMonitorFactory.NONE, fixture.getAccessStatistics(),
                 defaultConsistencyCheckThreadsNumber() );
-        return checker.execute( stores, FormattedLog.toOutputStream( failureOutput.stream() ),
+        return checker.execute( stores, FormattedLog.toOutputStream( System.out ),
                 new ConsistencyReporter.Monitor()
                 {
                     @Override

community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/StoreProcessorTest.java

@@ -21,6 +21,7 @@
 
 import org.junit.Rule;
 import org.junit.Test;
+
 import org.neo4j.consistency.checking.CheckDecorator;
 import org.neo4j.consistency.checking.RecordCheck;
 import org.neo4j.consistency.checking.cache.CacheAccess;
@@ -29,7 +30,7 @@
 import org.neo4j.kernel.impl.store.RecordStore;
 import org.neo4j.kernel.impl.store.StoreType;
 import org.neo4j.kernel.impl.store.record.NodeRecord;
-import org.neo4j.test.NeoStoresRule;
+import org.neo4j.test.rule.NeoStoresRule;
 
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;

community/consistency-check/src/test/java/org/neo4j/consistency/repair/RelationshipChainExplorerTest.java

@@ -38,9 +38,9 @@
 import org.neo4j.kernel.impl.store.RecordStore;
 import org.neo4j.kernel.impl.store.StoreAccess;
 import org.neo4j.kernel.impl.store.record.RelationshipRecord;
-import org.neo4j.test.PageCacheRule;
-import org.neo4j.test.TargetDirectory;
 import org.neo4j.test.TestGraphDatabaseFactory;
+import org.neo4j.test.rule.PageCacheRule;
+import org.neo4j.test.rule.TargetDirectory;
 
 import static org.junit.Assert.assertEquals;
 import static org.neo4j.kernel.impl.store.record.RecordLoad.NORMAL;

community/consistency-check/src/test/java/org/neo4j/unsafe/impl/batchimport/ParallelBatchImporterTest.java

@@ -58,10 +58,10 @@
 import org.neo4j.kernel.impl.factory.GraphDatabaseFacadeFactory;
 import org.neo4j.kernel.impl.logging.NullLogService;
 import org.neo4j.logging.NullLogProvider;
-import org.neo4j.test.RandomRule;
 import org.neo4j.test.Randoms;
-import org.neo4j.test.TargetDirectory;
 import org.neo4j.test.TestGraphDatabaseFactory;
+import org.neo4j.test.rule.RandomRule;
+import org.neo4j.test.rule.TargetDirectory;
 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;

community/cypher/cypher/src/test/java/org/neo4j/cypher/ManyMergesStressTest.java

@@ -36,7 +36,7 @@
 import org.neo4j.kernel.api.KernelTransaction;
 import org.neo4j.kernel.api.security.AccessMode;
 import org.neo4j.kernel.impl.coreapi.InternalTransaction;
-import org.neo4j.test.EmbeddedDatabaseRule;
+import org.neo4j.test.rule.EmbeddedDatabaseRule;
 
 import static java.lang.String.format;
 

community/cypher/cypher/src/test/java/org/neo4j/cypher/QueryInvalidationIT.java

@@ -36,8 +36,8 @@
 import org.neo4j.graphdb.factory.GraphDatabaseSettings;
 import org.neo4j.kernel.configuration.Config;
 import org.neo4j.kernel.monitoring.Monitors;
-import org.neo4j.test.DatabaseRule;
-import org.neo4j.test.ImpermanentDatabaseRule;
+import org.neo4j.test.rule.DatabaseRule;
+import org.neo4j.test.rule.ImpermanentDatabaseRule;
 
 import static java.util.Collections.singletonMap;
 import static java.util.concurrent.TimeUnit.SECONDS;

community/cypher/cypher/src/test/java/org/neo4j/cypher/internal/javacompat/CypherUpdateMapTest.java

@@ -31,9 +31,9 @@
 
 import static org.hamcrest.Matchers.not;
 import static org.junit.Assert.assertThat;
-import static org.neo4j.graphdb.Neo4jMatchers.hasProperty;
-import static org.neo4j.graphdb.Neo4jMatchers.inTx;
 import static org.neo4j.helpers.collection.MapUtil.map;
+import static org.neo4j.test.mockito.matcher.Neo4jMatchers.hasProperty;
+import static org.neo4j.test.mockito.matcher.Neo4jMatchers.inTx;
 
 public class CypherUpdateMapTest
 {

community/cypher/cypher/src/test/java/org/neo4j/cypher/internal/javacompat/ExecutionEngineTests.java

@@ -39,8 +39,8 @@
 import org.neo4j.kernel.impl.query.QuerySession;
 import org.neo4j.kernel.impl.query.TransactionalContext;
 import org.neo4j.logging.NullLogProvider;
-import org.neo4j.test.DatabaseRule;
-import org.neo4j.test.ImpermanentDatabaseRule;
+import org.neo4j.test.rule.DatabaseRule;
+import org.neo4j.test.rule.ImpermanentDatabaseRule;
 
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertThat;

community/cypher/cypher/src/test/java/org/neo4j/cypher/internal/javacompat/ExecutionResultTest.java

@@ -37,7 +37,7 @@
 import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge;
 import org.neo4j.kernel.impl.coreapi.TopLevelTransaction;
 import org.neo4j.kernel.impl.query.QueryExecutionKernelException;
-import org.neo4j.test.ImpermanentDatabaseRule;
+import org.neo4j.test.rule.ImpermanentDatabaseRule;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasSize;

community/cypher/cypher/src/test/java/org/neo4j/cypher/internal/javacompat/ServerExecutionEngineTest.java

@@ -23,7 +23,7 @@
 import org.junit.Test;
 
 import org.neo4j.kernel.impl.query.QueryExecutionEngine;
-import org.neo4j.test.EmbeddedDatabaseRule;
+import org.neo4j.test.rule.EmbeddedDatabaseRule;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;

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.TargetDirectory;
+import org.neo4j.test.rule.TargetDirectory;
 
 import static java.lang.System.currentTimeMillis;
 import static org.neo4j.graphalgo.CommonEvaluators.doubleCostEvaluator;

community/graph-algo/src/test/java/org/neo4j/graphalgo/path/PathExplosionIT.java

@@ -39,8 +39,8 @@
 import org.neo4j.graphdb.RelationshipType;
 import org.neo4j.graphdb.Transaction;
 import org.neo4j.io.fs.FileUtils;
-import org.neo4j.test.TargetDirectory;
 import org.neo4j.test.TestGraphDatabaseFactory;
+import org.neo4j.test.rule.TargetDirectory;
 
 import static java.lang.System.currentTimeMillis;
 import static org.junit.Assert.assertTrue;

community/graph-matching/src/test/java/examples/TestSiteIndexExamples.java

@@ -19,16 +19,16 @@
  */
 package examples;
 
+import org.junit.ClassRule;
+import org.junit.Test;
+
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.junit.ClassRule;
-import org.junit.Test;
-
 import org.neo4j.graphdb.Direction;
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.Node;
@@ -41,7 +41,7 @@
 import org.neo4j.graphmatching.PatternRelationship;
 import org.neo4j.graphmatching.ValueMatcher;
 import org.neo4j.helpers.collection.IterableWrapper;
-import org.neo4j.test.EmbeddedDatabaseRule;
+import org.neo4j.test.rule.EmbeddedDatabaseRule;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;

community/graph-matching/src/test/java/matching/TestMatchingOfCircularPattern.java

@@ -44,13 +44,12 @@
 import org.neo4j.graphmatching.PatternMatcher;
 import org.neo4j.graphmatching.PatternNode;
 import org.neo4j.helpers.collection.IteratorWrapper;
-import org.neo4j.test.TargetDirectory;
 import org.neo4j.test.TestGraphDatabaseFactory;
+import org.neo4j.test.rule.TargetDirectory;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.fail;
-
 import static org.neo4j.graphdb.RelationshipType.withName;
 import static org.neo4j.graphdb.traversal.Evaluators.toDepth;
 

community/graph-matching/src/test/java/matching/TestPatternMatching.java

@@ -50,9 +50,9 @@
 import org.neo4j.test.GraphDescription.Graph;
 import org.neo4j.test.GraphHolder;
 import org.neo4j.test.ProcessStreamHandler;
-import org.neo4j.test.TargetDirectory;
 import org.neo4j.test.TestData;
 import org.neo4j.test.TestGraphDatabaseFactory;
+import org.neo4j.test.rule.TargetDirectory;
 
 import static java.util.Arrays.asList;
 import static org.junit.Assert.assertEquals;

community/graphviz/src/test/java/org/neo4j/visualization/graphviz/TestGraphvizSubgraphOutput.java

@@ -19,19 +19,19 @@
  */
 package org.neo4j.visualization.graphviz;
 
-import java.io.ByteArrayOutputStream;
-import java.io.OutputStream;
-
 import org.junit.Rule;
 import org.junit.Test;
 
+import java.io.ByteArrayOutputStream;
+import java.io.OutputStream;
+
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.Relationship;
 import org.neo4j.graphdb.RelationshipType;
 import org.neo4j.graphdb.Transaction;
-import org.neo4j.test.DatabaseRule;
-import org.neo4j.test.ImpermanentDatabaseRule;
+import org.neo4j.test.rule.DatabaseRule;
+import org.neo4j.test.rule.ImpermanentDatabaseRule;
 import org.neo4j.visualization.SubgraphMapper;
 
 import static java.util.Arrays.asList;
@@ -43,7 +43,8 @@ enum type implements RelationshipType
         KNOWS, WORKS_FOR
     }
 
-    public final @Rule DatabaseRule dbRule = new ImpermanentDatabaseRule();
+    @Rule
+    public final DatabaseRule dbRule = new ImpermanentDatabaseRule();
 
     @Test
     public void testSimpleGraph() throws Exception

community/graphviz/src/test/java/org/neo4j/visualization/graphviz/TestNewGraphvizWriter.java

@@ -19,19 +19,19 @@
  */
 package org.neo4j.visualization.graphviz;
 
-import java.io.ByteArrayOutputStream;
-import java.io.OutputStream;
-
 import org.junit.Rule;
 import org.junit.Test;
 
+import java.io.ByteArrayOutputStream;
+import java.io.OutputStream;
+
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.Relationship;
 import org.neo4j.graphdb.RelationshipType;
 import org.neo4j.graphdb.Transaction;
-import org.neo4j.test.DatabaseRule;
-import org.neo4j.test.ImpermanentDatabaseRule;
+import org.neo4j.test.rule.DatabaseRule;
+import org.neo4j.test.rule.ImpermanentDatabaseRule;
 import org.neo4j.walk.Walker;
 
 public class TestNewGraphvizWriter
@@ -41,7 +41,8 @@ enum type implements RelationshipType
 		KNOWS, WORKS_FOR
 	}
 
-	public final @Rule DatabaseRule dbRule = new ImpermanentDatabaseRule();
+	@Rule
+	public final DatabaseRule dbRule = new ImpermanentDatabaseRule();
 
 	@Test
 	public void testSimpleGraph() throws Exception

community/import-tool/src/test/java/org/neo4j/tooling/ImportToolDocIT.java

@@ -42,9 +42,9 @@
 import org.neo4j.graphdb.ResourceIterator;
 import org.neo4j.graphdb.Transaction;
 import org.neo4j.helpers.collection.Iterables;
-import org.neo4j.test.TargetDirectory;
-import org.neo4j.test.TargetDirectory.TestDirectory;
 import org.neo4j.test.TestGraphDatabaseFactory;
+import org.neo4j.test.rule.TargetDirectory;
+import org.neo4j.test.rule.TargetDirectory.TestDirectory;
 import org.neo4j.tooling.ImportTool.Options;
 import org.neo4j.unsafe.impl.batchimport.Configuration;
 

community/import-tool/src/test/java/org/neo4j/tooling/ImportToolNumericalFailureTests.java

@@ -32,8 +32,8 @@
 import java.util.Arrays;
 import java.util.List;
 
-import org.neo4j.test.EmbeddedDatabaseRule;
-import org.neo4j.test.SuppressOutput;
+import org.neo4j.test.rule.EmbeddedDatabaseRule;
+import org.neo4j.test.rule.SuppressOutput;
 import org.neo4j.unsafe.impl.batchimport.input.InputException;
 
 import static org.junit.Assert.fail;

community/import-tool/src/test/java/org/neo4j/tooling/ImportToolTest.java

@@ -59,9 +59,9 @@
 import org.neo4j.kernel.impl.util.Validator;
 import org.neo4j.kernel.impl.util.Validators;
 import org.neo4j.kernel.internal.Version;
-import org.neo4j.test.EmbeddedDatabaseRule;
-import org.neo4j.test.RandomRule;
-import org.neo4j.test.SuppressOutput;
+import org.neo4j.test.rule.EmbeddedDatabaseRule;
+import org.neo4j.test.rule.RandomRule;
+import org.neo4j.test.rule.SuppressOutput;
 import org.neo4j.unsafe.impl.batchimport.cache.idmapping.string.DuplicateInputIdException;
 import org.neo4j.unsafe.impl.batchimport.input.InputException;
 import org.neo4j.unsafe.impl.batchimport.input.csv.Configuration;

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.TargetDirectory;
+import org.neo4j.test.rule.TargetDirectory;
 
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;

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.TargetDirectory;
+import org.neo4j.test.rule.TargetDirectory;
 
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.isOneOf;

community/io/src/test/java/org/neo4j/io/pagecache/impl/muninn/MuninnPageCacheSlowTestWithRealFileSystemIT.java

@@ -22,7 +22,7 @@
 import org.junit.Rule;
 
 import org.neo4j.io.fs.DefaultFileSystemAbstraction;
-import org.neo4j.test.TargetDirectory;
+import org.neo4j.test.rule.TargetDirectory;
 
 public class MuninnPageCacheSlowTestWithRealFileSystemIT extends MuninnPageCacheSlowIT
 {