From bb3e70d097f6ff26e570020f1ce4ad008f6f5695 Mon Sep 17 00:00:00 2001 From: Mikhaylo Demianenko Date: Mon, 4 Apr 2016 00:33:49 +0200 Subject: [PATCH] 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. --- ...onsistencyCheckServiceIntegrationTest.java | 2 +- .../consistency/ConsistencyCheckToolTest.java | 8 +- .../checking/GraphStoreFixture.java | 4 +- ...etectAllRelationshipInconsistenciesIT.java | 4 +- .../full/FullCheckIntegrationTest.java | 9 +- .../checking/full/StoreProcessorTest.java | 3 +- .../repair/RelationshipChainExplorerTest.java | 4 +- .../ParallelBatchImporterTest.java | 4 +- .../neo4j/cypher/ManyMergesStressTest.java | 2 +- .../org/neo4j/cypher/QueryInvalidationIT.java | 4 +- .../javacompat/CypherUpdateMapTest.java | 4 +- .../javacompat/ExecutionEngineTests.java | 4 +- .../javacompat/ExecutionResultTest.java | 2 +- .../javacompat/ServerExecutionEngineTest.java | 2 +- .../graphalgo/path/AStarPerformanceIT.java | 2 +- .../neo4j/graphalgo/path/PathExplosionIT.java | 2 +- .../java/examples/TestSiteIndexExamples.java | 8 +- .../TestMatchingOfCircularPattern.java | 3 +- .../java/matching/TestPatternMatching.java | 2 +- .../graphviz/TestGraphvizSubgraphOutput.java | 13 +-- .../graphviz/TestNewGraphvizWriter.java | 13 +-- .../org/neo4j/tooling/ImportToolDocIT.java | 4 +- .../ImportToolNumericalFailureTests.java | 4 +- .../org/neo4j/tooling/ImportToolTest.java | 6 +- ...FileSystemAbstractionInterruptionTest.java | 2 +- .../neo4j/io/pagecache/PageSwapperTest.java | 2 +- ...PageCacheSlowTestWithRealFileSystemIT.java | 2 +- .../MuninnPageCacheWithRealFileSystemIT.java | 2 +- .../test/{ => rule}/TargetDirectory.java | 5 +- .../java/examples/BatchInsertDocTest.java | 25 ++--- .../examples/CreateAndLoadDenseNodeIT.java | 2 +- .../test/java/examples/DeadlockDocTest.java | 2 +- .../AbstractMandatoryTransactionsTest.java | 2 +- .../neo4j/graphdb/CreateAndDeleteNodesIT.java | 2 +- .../neo4j/graphdb/DeleteNodeWithRelsIT.java | 2 +- .../java/org/neo4j/graphdb/DenseNodeIT.java | 4 +- .../org/neo4j/graphdb/FirstStartupIT.java | 2 +- .../graphdb/GraphDatabaseInternalLogIT.java | 4 +- .../graphdb/GraphDatabaseServiceTest.java | 8 +- .../java/org/neo4j/graphdb/IdReuseTest.java | 2 +- .../neo4j/graphdb/IndexingAcceptanceTest.java | 15 +-- .../org/neo4j/graphdb/LabelScanStoreIT.java | 4 +- .../neo4j/graphdb/LabelsAcceptanceTest.java | 14 +-- .../neo4j/graphdb/RunOutOfDiskSpaceIT.java | 11 +- .../neo4j/graphdb/SchemaAcceptanceTest.java | 18 ++-- .../SchemaIndexWaitingAcceptanceTest.java | 2 +- .../helpers/progress/ProgressMonitorTest.java | 2 +- .../GraphDatabaseFacadeFactoryTest.java | 2 +- .../neo4j/kernel/NeoStoreDataSourceTest.java | 8 +- .../java/org/neo4j/kernel/RecoveryIT.java | 2 +- .../java/org/neo4j/kernel/RecoveryTest.java | 2 +- .../kernel/TestTransactionEventDeadlocks.java | 8 +- .../org/neo4j/kernel/TokenCreationIT.java | 2 +- .../kernel/api/index/ArrayEncoderTest.java | 3 +- .../IndexProviderCompatibilityTestSuite.java | 3 +- .../SchemaConstraintProviderApprovalTest.java | 2 +- .../SchemaIndexProviderApprovalTest.java | 2 +- .../index/UniqueConstraintCompatibility.java | 4 +- .../kernel/counts/CompositeCountsTest.java | 7 +- .../neo4j/kernel/counts/LabelCountsTest.java | 7 +- .../neo4j/kernel/counts/NodeCountsTest.java | 12 ++- .../kernel/counts/RelationshipCountsTest.java | 12 ++- .../KernelExtensionFactoryContractTest.java | 2 +- .../DataAndSchemaTransactionSeparationIT.java | 7 +- .../api/KernelSchemaStateFlushingTest.java | 4 +- .../impl/api/LegacyBatchIndexApplierTest.java | 3 +- .../kernel/impl/api/LongDiffSetsTest.java | 11 +- .../kernel/impl/api/OperationsFacadeTest.java | 2 +- .../kernel/impl/api/SchemaLoggingIT.java | 2 +- ...nsactionRepresentationCommitProcessIT.java | 11 +- .../api/index/FlippableIndexProxyTest.java | 6 +- .../kernel/impl/api/index/IndexCRUDIT.java | 4 +- .../api/index/IndexPopulationJobTest.java | 80 +++++++------- .../impl/api/index/IndexRecoveryIT.java | 12 +-- .../kernel/impl/api/index/IndexRestartIT.java | 12 +-- .../index/IndexSamplingCancellationTest.java | 4 +- .../impl/api/index/IndexStatisticsIT.java | 2 +- .../impl/api/index/IndexStatisticsTest.java | 6 +- .../impl/api/index/IndexingServiceTest.java | 2 +- ...ropertyPhysicalToLogicalConverterTest.java | 4 +- .../api/integrationtest/RelationshipIT.java | 2 +- .../api/integrationtest/SchemaRecoveryIT.java | 2 +- ...nessConstraintValidationConcurrencyIT.java | 14 +-- .../state/IndexQueryTransactionStateTest.java | 4 +- .../api/state/LabelTransactionStateTest.java | 4 +- .../state/NoChangeWriteTransactionTest.java | 10 +- .../kernel/impl/api/state/TxStateTest.java | 2 +- .../impl/api/store/DiskLayerLabelTest.java | 4 +- .../api/store/StorePropertyCursorTest.java | 4 +- .../store/StorePropertyPayloadCursorTest.java | 2 +- .../impl/api/store/TestReferenceDangling.java | 4 +- .../MeasureDoNothingManualVerification.java | 79 -------------- .../neo4j/kernel/impl/core/BigStoreIT.java | 2 +- ...ConcurrentCreateAndGetRelationshipsIT.java | 2 +- .../kernel/impl/core/LargePropertiesIT.java | 2 +- .../kernel/impl/core/ManyPropertyKeysIT.java | 6 +- .../org/neo4j/kernel/impl/core/NodeTest.java | 6 +- .../impl/core/PropertyContainerProxyTest.java | 8 +- .../TestConcurrentIteratorModification.java | 2 +- .../impl/core/TestCrashWithRebuildSlow.java | 12 +-- .../core/TestDenseNodeRelChainPositionIT.java | 5 +- .../neo4j/kernel/impl/core/TestIdReuse.java | 6 +- .../kernel/impl/core/TestReadOnlyNeo4j.java | 11 +- .../impl/core/TestRelationshipCount.java | 7 +- .../impl/core/TestShortStringProperties.java | 11 +- .../impl/coreapi/schema/SchemaImplTest.java | 2 +- .../impl/event/TestTransactionEvents.java | 13 +-- .../impl/event/TransactionEventsIT.java | 12 ++- .../kernel/impl/index/TestIndexImplOnNeo.java | 2 +- .../LockingCompatibilityTestSuite.java | 8 +- .../locking/ReentrantLockServiceTest.java | 6 +- .../ConfiguringPageCacheFactoryTest.java | 9 +- .../impl/recovery/KernelRecoveryTest.java | 14 +-- .../recovery/RecoveryRequiredCheckerTest.java | 4 +- .../RecordStorageEngineTest.java | 5 +- .../impl/store/CommonAbstractStoreTest.java | 6 +- .../impl/store/FreeIdsAfterRecoveryTest.java | 6 +- .../store/IdGeneratorImplContractTest.java | 6 +- ...dGeneratorRebuildFailureEmulationTest.java | 8 +- .../kernel/impl/store/IdGeneratorTest.java | 4 +- .../kernel/impl/store/MetaDataStoreTest.java | 4 +- .../neo4j/kernel/impl/store/NeoStoresIT.java | 7 +- .../kernel/impl/store/NeoStoresMocking.java | 44 -------- .../kernel/impl/store/NeoStoresTest.java | 8 +- .../kernel/impl/store/NodeStoreTest.java | 4 +- .../kernel/impl/store/PropertyKeyTest.java | 2 +- .../kernel/impl/store/PropertyStoreTest.java | 4 +- .../kernel/impl/store/RecordSizesDocTest.java | 10 +- .../store/RecordStoreConsistentReadTest.java | 2 +- .../kernel/impl/store/RecordStoreUtil.java | 9 -- .../RelationshipChainPointerChasingTest.java | 4 +- .../store/RelationshipGroupStoreTest.java | 16 ++- .../kernel/impl/store/SchemaStorageTest.java | 12 +-- .../kernel/impl/store/SchemaStoreTest.java | 4 +- .../kernel/impl/store/StoreFactoryTest.java | 8 +- .../kernel/impl/store/TestArrayStore.java | 4 +- .../impl/store/TestBrokenStoreRecovery.java | 2 +- .../kernel/impl/store/TestDynamicStore.java | 14 +-- .../impl/store/TestGraphProperties.java | 16 +-- .../store/TestGrowingFileMemoryMapping.java | 10 +- .../impl/store/TestIdGeneratorRebuilding.java | 4 +- .../kernel/impl/store/TestStoreAccess.java | 4 +- .../kernel/impl/store/UpgradeStoreIT.java | 2 +- ...untsSnapshotSerializerIntegrationTest.java | 10 +- .../impl/store/counts/CountsComputerTest.java | 6 +- .../impl/store/counts/CountsRotationTest.java | 17 ++- .../impl/store/counts/CountsTrackerTest.java | 8 +- .../store/format/LimitedRecordGenerators.java | 2 +- .../impl/store/format/RecordFormatTest.java | 6 +- .../impl/store/id/IdGeneratorImplTest.java | 2 +- .../kvstore/AbstractKeyValueStoreTest.java | 7 +- .../kvstore/KeyValueStoreFileFormatTest.java | 8 +- .../storemigration/StoreVersionCheckTest.java | 4 +- .../UpgradableDatabaseTest.java | 4 +- .../LegacyStoreVersionCheckTest.java | 2 +- ...DeferredIndexedConflictResolutionTest.java | 4 +- .../DuplicatePropertyRemoverTest.java | 2 +- ...ndexConsultedPropertyBlockSweeperTest.java | 5 +- .../IndexLookupTest.java | 7 +- .../NonIndexedConflictResolverTest.java | 11 +- .../participant/StoreMigratorTest.java | 6 +- .../transaction/CommitContentionTests.java | 2 +- .../transaction/ManualAcquireLockTest.java | 11 +- .../PartialTransactionFailureIT.java | 4 +- .../transaction/ReadAheadLogChannelTest.java | 11 +- .../ReadTransactionLogWritingTest.java | 40 +++---- .../SynchronizedArrayIdOrderingQueueTest.java | 17 +-- .../command/HighIdTransactionApplierTest.java | 2 +- ...orkSyncTransactionApplicationStressIT.java | 10 +- .../log/BatchingTransactionAppenderTest.java | 6 +- .../log/PhysicalFlushableChannelTest.java | 10 +- .../transaction/log/PhysicalLogFileTest.java | 11 +- .../PhysicalLogicalTransactionStoreTest.java | 4 +- .../CheckPointerIntegrationTest.java | 2 +- .../transaction/log/entry/TestTxEntries.java | 8 +- .../TransactionAppenderStressTest.java | 2 +- .../state/ApplyRecoveredTransactionsTest.java | 8 +- .../state/NeoStoreIndexStoreViewTest.java | 2 +- .../transaction/state/NodeCommandTest.java | 9 +- .../state/NodeLabelsFieldTest.java | 7 +- .../transaction/state/PropertyLoaderTest.java | 2 +- .../state/RelationshipCreatorTest.java | 42 ++++---- .../state/RelationshipGroupGetterTest.java | 4 +- .../state/TransactionRecordStateTest.java | 2 +- .../kernel/impl/util/ConvertersTest.java | 5 +- .../neo4j/kernel/impl/util/FileUtilsTest.java | 2 +- .../impl/util/PrimitiveIteratorMatchers.java | 85 --------------- .../kernel/impl/util/ValidatorsTest.java | 4 +- .../GraphDbStructureGuideTest.java | 2 +- .../neo4j/kernel/internal/KernelDataTest.java | 2 +- .../StoreLockerLifecycleAdapterTest.java | 4 +- .../kernel/internal/StoreLockerTest.java | 2 +- .../neo4j/metatest/AsciiDocGeneratorTest.java | 2 +- .../neo4j/metatest/TargetDirectoryTest.java | 38 ------- .../org/neo4j/metatest/TestCleanupRule.java | 2 +- .../metatest/TestJavaTestDocsGenerator.java | 2 +- .../java/org/neo4j/test/FailureOutput.java | 86 --------------- .../org/neo4j/test/OtherThreadExecutor.java | 4 +- .../org/neo4j/test/ProcessStreamHandler.java | 2 +- .../neo4j/test/{ => assertion}/Assert.java | 9 +- .../test/impl/MultipleExceptionsStrategy.java | 100 ------------------ .../{ => mockito/answer}/AwaitAnswer.java | 10 +- .../mockito/answer/Neo4jMockitoAnswers.java} | 43 ++------ .../matcher}/IterableMatcher.java | 7 +- .../KernelExceptionUserMessageMatcher.java | 2 +- .../mockito/matcher}/LogMatchers.java | 2 +- .../mockito/matcher}/Neo4jMatchers.java | 8 +- .../{ => mockito/matcher}/RegexMatcher.java | 2 +- .../{mocking => mockito/mock}/GraphMock.java | 7 +- .../test/{mocking => mockito/mock}/Link.java | 2 +- .../{mocking => mockito/mock}/Properties.java | 8 +- .../neo4j/test/{ => rule}/CleanupRule.java | 6 +- .../neo4j/test/{ => rule}/DatabaseRule.java | 2 +- .../test/{ => rule}/EmbeddedDatabaseRule.java | 8 +- .../test/{ => rule}/ExternalResource.java | 2 +- .../test/{ => rule}/GraphTransactionRule.java | 5 +- .../{ => rule}/ImpermanentDatabaseRule.java | 3 +- .../org/neo4j/test/{ => rule}/LoggerRule.java | 5 +- .../{ => rule}/NeoStoreDataSourceRule.java | 2 +- .../neo4j/test/{ => rule}/NeoStoresRule.java | 2 +- .../neo4j/test/{ => rule}/PageCacheRule.java | 2 +- .../org/neo4j/test/{ => rule}/RandomRule.java | 3 +- .../rule}/RecordStorageEngineRule.java | 5 +- .../neo4j/test/{ => rule}/ResourceRule.java | 2 +- .../kvstore => test/rule}/Resources.java | 17 ++- .../neo4j/test/{ => rule}/SuppressOutput.java | 2 +- .../org/neo4j/test/{ => rule}/TimeRule.java | 2 +- .../test/{rules => rule}/VerboseTimeout.java | 2 +- .../concurrent}/OtherThreadRule.java | 12 ++- .../rule/concurrent}/ThreadRepository.java | 13 ++- .../{ => rule/concurrent}/ThreadingRule.java | 4 +- .../test/{ => rule}/docs/DocsIncludeFile.java | 9 +- .../rule/dump}/DumpProcessInformation.java | 5 +- .../dump}/DumpProcessInformationRule.java | 9 +- .../dump}/DumpProcessInformationTest.java | 4 +- .../rule/dump}/DumpVmInformation.java | 2 +- .../rule/dump}/DumpableProcess.java | 6 +- .../filesystem}/DefaultFileSystemRule.java | 11 +- .../filesystem}/EphemeralFileSystemRule.java | 2 +- .../{ => rule/system}/SystemExitError.java | 2 +- .../{ => rule/system}/SystemExitRule.java | 12 ++- .../system}/TestSecurityManager.java | 2 +- .../runner}/ParameterizedSuiteRunner.java | 16 +-- .../unsafe/batchinsert/BatchInsertTest.java | 8 +- .../unsafe/batchinsert/BigBatchStoreIT.java | 2 +- .../internal/BatchInserterImplTest.java | 6 +- .../ParallelizationCoordinatorTest.java | 2 +- .../batchimport/PropertyEncoderStepTest.java | 4 +- .../string/EncodingIdMapperTest.java | 3 +- .../batchimport/input/BadCollectorTest.java | 3 +- .../batchimport/input/InputCacheTest.java | 6 +- .../input/csv/CsvInputBatchImportIT.java | 4 +- .../batchimport/input/csv/CsvInputTest.java | 10 +- .../staging/LonelyProcessingStepTest.java | 2 +- .../staging/MultiExecutionMonitorTest.java | 10 +- .../staging/ProcessorStepTest.java | 4 +- .../store/BatchingNeoStoresTest.java | 5 +- .../src/test/java/examples/ImdbDocTest.java | 4 +- .../ConstraintIndexConcurrencyTest.java | 8 +- .../LegacyIndexAddDropConcurrently.java | 8 +- .../graphdb/LuceneLabelScanStoreChaosIT.java | 9 +- ...ryTransactionsForIndexHitsFacadeTests.java | 2 +- .../java/org/neo4j/index/LegacyIndexTest.java | 4 +- .../legacy/AutoIndexOperationsTest.java | 4 +- .../impl/lucene/legacy/BatchInsertionIT.java | 2 +- .../impl/lucene/legacy/IndexCreationTest.java | 2 +- .../legacy/LuceneCommandApplierTest.java | 5 +- .../lucene/legacy/LuceneDataSourceTest.java | 4 +- .../lucene/legacy/NonUniqueIndexTests.java | 2 +- .../lucene/legacy/PerformanceAndSanityIT.java | 2 +- .../impl/lucene/legacy/RecoveryTest.java | 6 +- .../lucene/ConstraintIndexFailureIT.java | 4 +- .../recovery/UniqueIndexRecoveryTests.java | 4 +- .../AbstractLuceneIndexIntegrationTest.java | 2 +- .../index/LuceneSchemaIndexPopulationIT.java | 2 +- ...neSchemaIndexUniquenessVerificationIT.java | 2 +- .../LuceneIndexSnapshotFileIteratorTest.java | 2 +- .../index/storage/FailureStorageTest.java | 2 +- .../storage/PartitionedIndexStorageTest.java | 4 +- .../SimpleUniquenessVerifierTest.java | 2 +- .../labelscan/LuceneLabelScanIndexIT.java | 2 +- .../labelscan/LuceneLabelScanStoreTest.java | 2 +- .../LuceneLabelScanStoreWriterTest.java | 2 +- .../impl/schema/LuceneIndexAccessorTest.java | 4 +- .../impl/schema/LuceneIndexRecoveryIT.java | 2 +- .../LuceneSchemaIndexCorruptionTest.java | 4 +- .../api/impl/schema/LuceneSchemaIndexIT.java | 2 +- .../LuceneSchemaIndexPopulatorTest.java | 4 +- .../impl/schema/LuceneSchemaIndexTest.java | 4 +- .../schema/SchemaIndexAcceptanceTest.java | 16 +-- .../impl/schema/UniqueIndexApplicationIT.java | 4 +- .../NonUniqueLuceneIndexPopulatorTest.java | 2 +- .../UniqueLuceneIndexPopulatorTest.java | 4 +- .../api/constraints/ConstraintCreationIT.java | 4 +- .../api/constraints/ConstraintRecoveryIT.java | 2 +- .../index/IndexingServiceIntegrationTest.java | 4 +- .../batchinsert/TestLuceneBatchInsert.java | 2 +- .../TestLuceneSchemaBatchInsertIT.java | 2 +- .../java/org/neo4j/harness/FixturesTest.java | 4 +- .../neo4j/harness/InProcessBuilderTest.java | 15 ++- .../java/org/neo4j/harness/JUnitRuleTest.java | 11 +- .../org/neo4j/harness/JavaProceduresTest.java | 4 +- .../java/ConcurrentChangesOnEntitiesTest.java | 2 +- .../test/java/counts/RebuildCountsTest.java | 4 +- .../src/test/java/db/DatabaseStartupTest.java | 2 +- .../java/files/TestNoFileDescriptorLeaks.java | 2 +- .../index/IndexSamplingIntegrationTest.java | 4 +- .../neo4j/index/IndexTxStateLookupTest.java | 4 +- .../recovery/CountsStoreRecoveryTest.java | 8 +- .../TestRecoveryMultipleDataSources.java | 2 +- .../java/recovery/TestRecoveryScenarios.java | 4 +- .../java/recovery/UniquenessRecoveryTest.java | 8 +- .../schema/IndexPopulationFlipRaceIT.java | 12 +-- .../MultipleIndexPopulationStressIT.java | 6 +- ...TestStartTransactionDuringLogRotation.java | 4 +- .../upgrade/FailToStartStoreMigratorIT.java | 4 +- .../upgrade/StoreUpgradeOnStartupTest.java | 4 +- .../StoreUpgraderInterruptionTestIT.java | 7 +- .../test/java/upgrade/StoreUpgraderTest.java | 6 +- .../TestMigrateToDenseNodeSupport.java | 2 +- ...pertyReadOnNewEntityBeforeLockRelease.java | 4 +- .../main/java/org/neo4j/graphdb/Resource.java | 7 +- .../neo4j/server/BaseBootstrapperTest.java | 13 ++- .../server/BlockingBootstrapperTest.java | 7 +- .../configuration/ConfigLoaderTest.java | 4 +- .../TestLifecycleManagedDatabase.java | 6 +- .../server/integration/StartupLoggingIT.java | 18 ++-- .../neo4j/server/modules/DBMSModuleTest.java | 11 +- .../server/preflight/TestPreflightTasks.java | 5 +- .../server/rest/BatchOperationDocIT.java | 4 +- .../org/neo4j/server/rest/IndexNodeDocIT.java | 4 +- .../org/neo4j/server/rest/LabelsDocIT.java | 6 +- .../neo4j/server/rest/ManageNodeDocIT.java | 2 +- .../neo4j/server/rest/RelationshipDocIT.java | 4 +- .../server/rest/SchemaConstraintsDocIT.java | 6 +- .../neo4j/server/rest/SchemaIndexDocIT.java | 4 +- .../server/rest/SetNodePropertiesDocIT.java | 4 +- .../rest/paging/PagedTraverserDocIT.java | 2 +- .../rest/paging/PagedTraverserTest.java | 6 +- .../repr/CypherResultRepresentationTest.java | 20 ++-- .../rest/repr/NodeRepresentationTest.java | 10 +- .../rest/repr/PathRepresentationTest.java | 17 +-- .../repr/RelationshipRepresentationTest.java | 15 +-- .../StreamingBatchOperationDocIT.java | 4 +- .../ExecutionResultSerializerTest.java | 14 +-- .../GraphExtractionWriterTest.java | 10 +- .../transactional/integration/DeadlockIT.java | 12 +-- .../integration/TransientErrorIT.java | 2 +- .../rest/web/CollectUserAgentFilterTest.java | 4 +- .../server/web/JettyThreadLimitTest.java | 9 +- .../neo4j/server/web/TestJetty9WebServer.java | 7 +- .../server/web/logging/HTTPLoggingDocIT.java | 17 +-- .../test/server/ExclusiveServerTestBase.java | 6 +- .../test/server/SharedServerTestBase.java | 6 +- .../org/neo4j/shell/AbstractShellTest.java | 2 +- .../neo4j/shell/ErrorsAndWarningsTest.java | 2 +- .../java/org/neo4j/shell/StartClientTest.java | 6 +- .../test/java/org/neo4j/shell/TestApps.java | 19 ++-- .../org/neo4j/shell/TestRmiPublication.java | 2 +- .../org/neo4j/shell/kernel/apps/CdTest.java | 52 ++++----- .../org/neo4j/backup/BackupEmbeddedIT.java | 16 +-- .../org/neo4j/backup/BackupServiceIT.java | 8 +- .../java/org/neo4j/backup/BackupToolTest.java | 14 +-- .../neo4j/backup/IncrementalBackupTests.java | 4 +- .../java/org/neo4j/backup/TestBackup.java | 6 +- .../org/neo4j/backup/TestConfiguration.java | 2 +- .../cluster/ClusterConfigurationTest.java | 9 +- .../protocol/cluster/ClusterMockTest.java | 8 +- .../protocol/cluster/ClusterNetworkTest.java | 16 +-- .../neo4j/com/storecopy/ResponsePackerIT.java | 4 +- .../com/storecopy/StoreCopyClientTest.java | 4 +- enterprise/core-edge/pom.xml | 8 ++ .../catchup/storecopy/LocalDatabaseTest.java | 3 +- ...FilenameBasedLogVersionRepositoryTest.java | 11 +- .../raft/log/RaftLogDurabilityTest.java | 13 ++- .../raft/log/RaftLogVerificationIT.java | 2 +- .../log/physical/PhysicalRaftLogFileTest.java | 11 +- ...aftMembershipStateRecoveryManagerTest.java | 2 +- .../raft/replication/RaftReplicatorTest.java | 2 +- .../id/StateRecoveryManagerTest.java | 10 +- .../raft/state/DurableStateStorageIT.java | 10 +- .../raft/state/DurableStateStorageTest.java | 8 +- .../scenarios/ClusterFormationIT.java | 8 +- .../coreedge/scenarios/ClusterShutdownIT.java | 11 +- .../scenarios/ConcurrentLockingIT.java | 4 +- .../scenarios/ConvertNonCoreEdgeStoreIT.java | 4 +- .../coreedge/scenarios/CoreEdgeRolesIT.java | 2 +- .../scenarios/CoreServerReplicationIT.java | 2 +- .../scenarios/CoreToCoreCopySnapshotIT.java | 2 +- .../scenarios/EdgeServerReplicationIT.java | 14 ++- .../neo4j/coreedge/scenarios/RecoveryIT.java | 14 ++- .../neo4j/coreedge/scenarios/RestartIT.java | 2 +- .../ReplicatedLockTokenStateMachineTest.java | 2 +- .../ha/src/test/java/jmx/JmxDocTest.java | 4 +- .../test/java/org/neo4j/ha/BackupHaIT.java | 2 +- .../java/org/neo4j/ha/ForeignStoreIdIT.java | 2 +- .../test/java/org/neo4j/ha/PullStormIT.java | 2 +- .../java/org/neo4j/ha/QuorumWritesIT.java | 2 +- .../java/org/neo4j/ha/TestBranchedData.java | 4 +- .../java/org/neo4j/ha/TestPullUpdates.java | 4 +- .../org/neo4j/ha/TestPullUpdatesApplied.java | 2 +- .../neo4j/ha/TransactionConstraintsIT.java | 13 +-- .../UniquenessConstraintValidationHAIT.java | 5 +- .../neo4j/ha/upgrade/RollingUpgradeIT.java | 4 +- .../impl/labelscan/LabelScanStoreHaIT.java | 2 +- .../kernel/ha/ClusterTopologyChangesIT.java | 15 ++- .../ha/ConcurrentInstanceStartupIT.java | 2 +- .../kernel/ha/ConflictingServerIdIT.java | 2 +- .../java/org/neo4j/kernel/ha/HardKillIT.java | 2 +- .../kernel/ha/OnDiskLastTxIdGetterTest.java | 4 +- .../ha/PropertyConstraintsStressIT.java | 4 +- .../kernel/ha/SlaveUpdatePullerTest.java | 6 +- .../org/neo4j/kernel/ha/SlaveUpgradeTest.java | 2 +- .../kernel/ha/TestBasicHaOperations.java | 2 +- .../org/neo4j/kernel/ha/TestFailover.java | 10 +- ...stFailoverWithAdditionalSlaveFailures.java | 14 +-- .../ha/TestMasterCommittingAtSlave.java | 8 +- .../kernel/ha/TxPushStrategyConfigIT.java | 4 +- .../ha/com/master/ConversationTest.java | 2 +- .../MasterImplConversationStopFuzzIT.java | 2 +- .../kernel/ha/com/master/MasterImplTest.java | 2 +- .../kernel/internal/HaKernelDataTest.java | 2 +- .../java/org/neo4j/test/ManagedResource.java | 2 + .../java/org/neo4j/test/ha/ClusterRule.java | 2 +- .../java/org/neo4j/test/ha/ClusterTest.java | 4 +- .../test/java/slavetest/TestInstanceJoin.java | 2 +- .../graphdb/SchemaWithPECAcceptanceTest.java | 6 +- .../StartupConstraintSemanticsTest.java | 6 +- ...ertyExistenceConstraintVerificationIT.java | 13 ++- .../forseti/ForsetiServiceLoadingTest.java | 4 +- .../store/format/highlimit/ReferenceTest.java | 2 +- ...econdaryPageCursorReadDataAdapterTest.java | 2 +- .../neo4j/shell/EnterpriseVersionTest.java | 4 +- .../rule}/EnterpriseDatabaseRule.java | 5 +- .../neo4j/management/ManagementBeansTest.java | 2 +- .../neo4j/management/TestLockManagerBean.java | 12 ++- .../java/org/neo4j/metrics/BoltMetricsIT.java | 2 +- .../org/neo4j/metrics/CoreEdgeMetricsIT.java | 4 +- .../org/neo4j/metrics/MetricsTestHelper.java | 2 +- .../neo4j/metrics/output/CsvOutputTest.java | 2 +- .../BatchInsertEnterpriseTest.java | 2 +- .../java/upgrade/StoreMigratorFrom20IT.java | 14 +-- .../java/upgrade/StoreMigratorFrom21IT.java | 2 +- .../EnterpriseInProcessServerBuilderTest.java | 4 +- .../junit/EnterpriseNeo4jRuleTest.java | 2 +- .../kernel/impl/query/QueryLoggerIT.java | 4 +- .../enterprise/ArbiterBootstrapperIT.java | 18 ++-- .../EnterpriseBootstrapperTest.java | 7 +- .../StandaloneHaInfoFunctionalTest.java | 22 ++-- .../enterprise/jmx/ServerManagementTest.java | 5 +- .../EnterpriseVersionAndEditionServiceIT.java | 2 +- .../PropertyExistenceConstraintsDocIT.java | 2 +- .../ext/udc/impl/UdcExtensionImplTest.java | 4 +- .../java/org/neo4j/ha/HAClusterStartupIT.java | 4 +- .../LegacyIndexesUpgradeTest.java | 4 +- .../StoreUpgradeIntegrationTest.java | 17 ++- .../org/neo4j/examples/GetOrCreateDocIT.java | 2 +- .../neo4j/examples/PathFindingDocTest.java | 2 +- .../StartWithConfigurationDocTest.java | 8 +- .../doc/ExtensionTestingDocTest.java | 2 +- .../harness/enterprise/doc/JUnitDocTest.java | 2 +- .../harness/doc/ExtensionTestingDocTest.java | 2 +- .../org/neo4j/harness/doc/JUnitDocTest.java | 5 +- .../applytx/DatabaseRebuildToolTest.java | 6 +- .../neo4j/tools/dump/DumpCountsStoreTest.java | 2 +- .../tools/migration/StoreMigrationTest.java | 4 +- .../tools/rebuild/RebuildFromLogsTest.java | 6 +- .../neo4j/tools/txlog/CheckTxLogsTest.java | 6 +- 468 files changed, 1393 insertions(+), 1856 deletions(-) rename community/io/src/test/java/org/neo4j/test/{ => rule}/TargetDirectory.java (98%) delete mode 100644 community/kernel/src/test/java/org/neo4j/kernel/impl/cache/MeasureDoNothingManualVerification.java delete mode 100644 community/kernel/src/test/java/org/neo4j/kernel/impl/store/NeoStoresMocking.java delete mode 100644 community/kernel/src/test/java/org/neo4j/kernel/impl/util/PrimitiveIteratorMatchers.java delete mode 100644 community/kernel/src/test/java/org/neo4j/metatest/TargetDirectoryTest.java delete mode 100644 community/kernel/src/test/java/org/neo4j/test/FailureOutput.java rename community/kernel/src/test/java/org/neo4j/test/{ => assertion}/Assert.java (98%) delete mode 100644 community/kernel/src/test/java/org/neo4j/test/impl/MultipleExceptionsStrategy.java rename community/kernel/src/test/java/org/neo4j/test/{ => mockito/answer}/AwaitAnswer.java (93%) rename community/kernel/src/test/java/org/neo4j/{graphdb/Neo4jMockitoHelpers.java => test/mockito/answer/Neo4jMockitoAnswers.java} (56%) rename community/kernel/src/test/java/org/neo4j/test/{ => mockito/matcher}/IterableMatcher.java (98%) rename community/kernel/src/test/java/org/neo4j/test/{ => mockito/matcher}/KernelExceptionUserMessageMatcher.java (98%) rename community/kernel/src/test/java/org/neo4j/{kernel/impl/transaction => test/mockito/matcher}/LogMatchers.java (99%) rename community/kernel/src/test/java/org/neo4j/{graphdb => test/mockito/matcher}/Neo4jMatchers.java (98%) rename community/kernel/src/test/java/org/neo4j/test/{ => mockito/matcher}/RegexMatcher.java (97%) rename community/kernel/src/test/java/org/neo4j/test/{mocking => mockito/mock}/GraphMock.java (95%) rename community/kernel/src/test/java/org/neo4j/test/{mocking => mockito/mock}/Link.java (98%) rename community/kernel/src/test/java/org/neo4j/test/{mocking => mockito/mock}/Properties.java (98%) rename community/kernel/src/test/java/org/neo4j/test/{ => rule}/CleanupRule.java (99%) rename community/kernel/src/test/java/org/neo4j/test/{ => rule}/DatabaseRule.java (99%) rename community/kernel/src/test/java/org/neo4j/test/{ => rule}/EmbeddedDatabaseRule.java (95%) rename community/kernel/src/test/java/org/neo4j/test/{ => rule}/ExternalResource.java (98%) rename community/kernel/src/test/java/org/neo4j/test/{ => rule}/GraphTransactionRule.java (95%) rename community/kernel/src/test/java/org/neo4j/test/{ => rule}/ImpermanentDatabaseRule.java (96%) rename community/kernel/src/test/java/org/neo4j/test/{ => rule}/LoggerRule.java (96%) rename community/kernel/src/test/java/org/neo4j/test/{ => rule}/NeoStoreDataSourceRule.java (99%) rename community/kernel/src/test/java/org/neo4j/test/{ => rule}/NeoStoresRule.java (99%) rename community/kernel/src/test/java/org/neo4j/test/{ => rule}/PageCacheRule.java (99%) rename community/kernel/src/test/java/org/neo4j/test/{ => rule}/RandomRule.java (98%) rename community/kernel/src/test/java/org/neo4j/{kernel/impl/storageengine/impl/recordstorage => test/rule}/RecordStorageEngineRule.java (98%) rename community/kernel/src/test/java/org/neo4j/test/{ => rule}/ResourceRule.java (99%) rename community/kernel/src/test/java/org/neo4j/{kernel/impl/store/kvstore => test/rule}/Resources.java (95%) rename community/kernel/src/test/java/org/neo4j/test/{ => rule}/SuppressOutput.java (99%) rename community/kernel/src/test/java/org/neo4j/test/{ => rule}/TimeRule.java (98%) rename community/kernel/src/test/java/org/neo4j/test/{rules => rule}/VerboseTimeout.java (99%) rename community/kernel/src/test/java/org/neo4j/test/{ => rule/concurrent}/OtherThreadRule.java (98%) rename community/kernel/src/test/java/org/neo4j/{kernel/impl/locking => test/rule/concurrent}/ThreadRepository.java (99%) rename community/kernel/src/test/java/org/neo4j/test/{ => rule/concurrent}/ThreadingRule.java (97%) rename community/kernel/src/test/java/org/neo4j/test/{ => rule}/docs/DocsIncludeFile.java (98%) rename community/kernel/src/test/java/org/neo4j/{qa/tooling => test/rule/dump}/DumpProcessInformation.java (99%) rename community/kernel/src/test/java/org/neo4j/{qa/tooling => test/rule/dump}/DumpProcessInformationRule.java (98%) rename community/kernel/src/test/java/org/neo4j/{qa/tooling => test/rule/dump}/DumpProcessInformationTest.java (98%) rename community/kernel/src/test/java/org/neo4j/{qa/tooling => test/rule/dump}/DumpVmInformation.java (98%) rename community/kernel/src/test/java/org/neo4j/{qa/tooling => test/rule/dump}/DumpableProcess.java (97%) rename community/kernel/src/test/java/org/neo4j/test/{ => rule/filesystem}/DefaultFileSystemRule.java (89%) rename community/kernel/src/test/java/org/neo4j/test/{ => rule/filesystem}/EphemeralFileSystemRule.java (97%) rename community/kernel/src/test/java/org/neo4j/test/{ => rule/system}/SystemExitError.java (97%) rename community/kernel/src/test/java/org/neo4j/test/{ => rule/system}/SystemExitRule.java (95%) rename community/kernel/src/test/java/org/neo4j/test/{ => rule/system}/TestSecurityManager.java (99%) rename community/kernel/src/test/java/org/neo4j/{kernel/api/index => test/runner}/ParameterizedSuiteRunner.java (99%) rename enterprise/kernel/src/test/java/org/neo4j/{graphdb/factory => test/rule}/EnterpriseDatabaseRule.java (87%) 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 4533bbf25d8a0..0201acb9bbd81 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,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; 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 70d761e759bb2..313ae8c0d3e5a 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,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 { 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 3b32ab8c3e596..9e3b731ffe6a8 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 @@ -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; 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 7cc887112cf6d..94d7652c2f5ba 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,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; diff --git a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/FullCheckIntegrationTest.java b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/FullCheckIntegrationTest.java index 3e9395b128eb8..f04056f55131d 100644 --- a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/FullCheckIntegrationTest.java +++ b/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 diff --git a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/StoreProcessorTest.java b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/StoreProcessorTest.java index 1bc232f4c3ac9..312246a19e3cf 100644 --- a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/StoreProcessorTest.java +++ b/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; 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 da87c9666d4d0..0c350668917cd 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 @@ -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; 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 e9cbd8b831fec..84d61a095d415 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 @@ -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; diff --git a/community/cypher/cypher/src/test/java/org/neo4j/cypher/ManyMergesStressTest.java b/community/cypher/cypher/src/test/java/org/neo4j/cypher/ManyMergesStressTest.java index 4ca1af4834236..c7d1728c30b8f 100644 --- a/community/cypher/cypher/src/test/java/org/neo4j/cypher/ManyMergesStressTest.java +++ b/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; diff --git a/community/cypher/cypher/src/test/java/org/neo4j/cypher/QueryInvalidationIT.java b/community/cypher/cypher/src/test/java/org/neo4j/cypher/QueryInvalidationIT.java index f5a3237b2546b..c4f2e67466290 100644 --- a/community/cypher/cypher/src/test/java/org/neo4j/cypher/QueryInvalidationIT.java +++ b/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; diff --git a/community/cypher/cypher/src/test/java/org/neo4j/cypher/internal/javacompat/CypherUpdateMapTest.java b/community/cypher/cypher/src/test/java/org/neo4j/cypher/internal/javacompat/CypherUpdateMapTest.java index 64b3caca8848c..8c16659c79c54 100644 --- a/community/cypher/cypher/src/test/java/org/neo4j/cypher/internal/javacompat/CypherUpdateMapTest.java +++ b/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 { diff --git a/community/cypher/cypher/src/test/java/org/neo4j/cypher/internal/javacompat/ExecutionEngineTests.java b/community/cypher/cypher/src/test/java/org/neo4j/cypher/internal/javacompat/ExecutionEngineTests.java index 930d0bda6e3c3..ca62fc082bca5 100644 --- a/community/cypher/cypher/src/test/java/org/neo4j/cypher/internal/javacompat/ExecutionEngineTests.java +++ b/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; diff --git a/community/cypher/cypher/src/test/java/org/neo4j/cypher/internal/javacompat/ExecutionResultTest.java b/community/cypher/cypher/src/test/java/org/neo4j/cypher/internal/javacompat/ExecutionResultTest.java index aebbad2f2294a..bd85cc8460821 100644 --- a/community/cypher/cypher/src/test/java/org/neo4j/cypher/internal/javacompat/ExecutionResultTest.java +++ b/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; diff --git a/community/cypher/cypher/src/test/java/org/neo4j/cypher/internal/javacompat/ServerExecutionEngineTest.java b/community/cypher/cypher/src/test/java/org/neo4j/cypher/internal/javacompat/ServerExecutionEngineTest.java index 85d27ddf7e37d..172bac07fae24 100644 --- a/community/cypher/cypher/src/test/java/org/neo4j/cypher/internal/javacompat/ServerExecutionEngineTest.java +++ b/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; 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 a9166edaa8a65..2479c530d5d1f 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.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static java.lang.System.currentTimeMillis; import static org.neo4j.graphalgo.CommonEvaluators.doubleCostEvaluator; 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 fe0829c17507e..7b076332e71f1 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 @@ -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; diff --git a/community/graph-matching/src/test/java/examples/TestSiteIndexExamples.java b/community/graph-matching/src/test/java/examples/TestSiteIndexExamples.java index 2c6b195391839..624f5692fe4b3 100644 --- a/community/graph-matching/src/test/java/examples/TestSiteIndexExamples.java +++ b/community/graph-matching/src/test/java/examples/TestSiteIndexExamples.java @@ -19,6 +19,9 @@ */ package examples; +import org.junit.ClassRule; +import org.junit.Test; + import java.util.Arrays; import java.util.Calendar; import java.util.Date; @@ -26,9 +29,6 @@ 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; diff --git a/community/graph-matching/src/test/java/matching/TestMatchingOfCircularPattern.java b/community/graph-matching/src/test/java/matching/TestMatchingOfCircularPattern.java index 70505de07caf1..f02d8daa76475 100644 --- a/community/graph-matching/src/test/java/matching/TestMatchingOfCircularPattern.java +++ b/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; diff --git a/community/graph-matching/src/test/java/matching/TestPatternMatching.java b/community/graph-matching/src/test/java/matching/TestPatternMatching.java index 11c79213a7379..7c0035b31aa46 100644 --- a/community/graph-matching/src/test/java/matching/TestPatternMatching.java +++ b/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; diff --git a/community/graphviz/src/test/java/org/neo4j/visualization/graphviz/TestGraphvizSubgraphOutput.java b/community/graphviz/src/test/java/org/neo4j/visualization/graphviz/TestGraphvizSubgraphOutput.java index fe85e3a021bce..da76dbb1a12da 100644 --- a/community/graphviz/src/test/java/org/neo4j/visualization/graphviz/TestGraphvizSubgraphOutput.java +++ b/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 diff --git a/community/graphviz/src/test/java/org/neo4j/visualization/graphviz/TestNewGraphvizWriter.java b/community/graphviz/src/test/java/org/neo4j/visualization/graphviz/TestNewGraphvizWriter.java index b4993dce1439b..30f9b216e9b04 100644 --- a/community/graphviz/src/test/java/org/neo4j/visualization/graphviz/TestNewGraphvizWriter.java +++ b/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 diff --git a/community/import-tool/src/test/java/org/neo4j/tooling/ImportToolDocIT.java b/community/import-tool/src/test/java/org/neo4j/tooling/ImportToolDocIT.java index 48d02f4a7a564..cd8556ccb0bd4 100644 --- a/community/import-tool/src/test/java/org/neo4j/tooling/ImportToolDocIT.java +++ b/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; diff --git a/community/import-tool/src/test/java/org/neo4j/tooling/ImportToolNumericalFailureTests.java b/community/import-tool/src/test/java/org/neo4j/tooling/ImportToolNumericalFailureTests.java index e48763bcfb9b0..4c5d73e0df2a7 100644 --- a/community/import-tool/src/test/java/org/neo4j/tooling/ImportToolNumericalFailureTests.java +++ b/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; diff --git a/community/import-tool/src/test/java/org/neo4j/tooling/ImportToolTest.java b/community/import-tool/src/test/java/org/neo4j/tooling/ImportToolTest.java index 0b4f1fa2c3ded..107cd99d83604 100644 --- a/community/import-tool/src/test/java/org/neo4j/tooling/ImportToolTest.java +++ b/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; 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 411d959d032a4..2aceaebb63527 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.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; 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 0037db0913a25..4bbee1e0e0a09 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.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.isOneOf; 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 fd48a01ebf0e6..20359ef2bb4bf 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 @@ -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 { 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 8c3ad4b250eda..1d5761dc7a94b 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 @@ -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 MuninnPageCacheWithRealFileSystemIT extends MuninnPageCacheTest { diff --git a/community/io/src/test/java/org/neo4j/test/TargetDirectory.java b/community/io/src/test/java/org/neo4j/test/rule/TargetDirectory.java similarity index 98% rename from community/io/src/test/java/org/neo4j/test/TargetDirectory.java rename to community/io/src/test/java/org/neo4j/test/rule/TargetDirectory.java index 3cbd2edb4ee6d..c5d882e10edc5 100644 --- a/community/io/src/test/java/org/neo4j/test/TargetDirectory.java +++ b/community/io/src/test/java/org/neo4j/test/rule/TargetDirectory.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.test; +package org.neo4j.test.rule; import org.junit.Rule; import org.junit.rules.TestRule; @@ -32,6 +32,7 @@ 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; @@ -191,7 +192,7 @@ public static TestDirectory testDirForTestWithEphemeralFS( EphemeralFileSystemAb return new TargetDirectory( fileSystem, owningTest ).testDirectory(); } - TargetDirectory( FileSystemAbstraction fileSystem, Class owningTest ) + public TargetDirectory( FileSystemAbstraction fileSystem, Class owningTest ) { this.fileSystem = fileSystem; this.base = new File( new File( locateTarget( owningTest ), "test-data" ), owningTest.getName() ) diff --git a/community/kernel/src/test/java/examples/BatchInsertDocTest.java b/community/kernel/src/test/java/examples/BatchInsertDocTest.java index fa6c422cfd2b7..6d48c639c7925 100644 --- a/community/kernel/src/test/java/examples/BatchInsertDocTest.java +++ b/community/kernel/src/test/java/examples/BatchInsertDocTest.java @@ -44,7 +44,7 @@ import org.neo4j.helpers.collection.MapUtil; import org.neo4j.io.fs.DefaultFileSystemAbstraction; import org.neo4j.io.fs.FileUtils; -import org.neo4j.test.DefaultFileSystemRule; +import org.neo4j.test.rule.filesystem.DefaultFileSystemRule; import org.neo4j.unsafe.batchinsert.BatchInserter; import org.neo4j.unsafe.batchinsert.BatchInserters; @@ -53,6 +53,18 @@ public class BatchInsertDocTest { + @Rule + public DefaultFileSystemRule fileSystemRule = new DefaultFileSystemRule(); + private DefaultFileSystemAbstraction fileSystem; + + @Before + public void before() throws Exception + { + fileSystem = fileSystemRule.get(); + fileSystem.mkdirs( new File( "target" ) ); + fileSystem.mkdirs( new File( "target/docs" ) ); + } + @Test public void insert() throws Exception { @@ -150,15 +162,4 @@ public void insertWithConfigFile() throws IOException // END SNIPPET: configFileInsert } - @Rule - public DefaultFileSystemRule fileSystemRule = new DefaultFileSystemRule(); - private DefaultFileSystemAbstraction fileSystem; - - @Before - public void before() throws Exception - { - fileSystem = fileSystemRule.get(); - fileSystem.mkdirs( new File( "target" ) ); - fileSystem.mkdirs( new File( "target/docs" ) ); - } } diff --git a/community/kernel/src/test/java/examples/CreateAndLoadDenseNodeIT.java b/community/kernel/src/test/java/examples/CreateAndLoadDenseNodeIT.java index 2acebcd2218d0..baeb83f8493a9 100644 --- a/community/kernel/src/test/java/examples/CreateAndLoadDenseNodeIT.java +++ b/community/kernel/src/test/java/examples/CreateAndLoadDenseNodeIT.java @@ -35,7 +35,7 @@ import org.neo4j.helpers.collection.Iterables; import org.neo4j.kernel.impl.MyRelTypes; import org.neo4j.test.BatchTransaction; -import org.neo4j.test.EmbeddedDatabaseRule; +import org.neo4j.test.rule.EmbeddedDatabaseRule; import static org.junit.Assert.assertEquals; import static org.neo4j.graphdb.Direction.BOTH; diff --git a/community/kernel/src/test/java/examples/DeadlockDocTest.java b/community/kernel/src/test/java/examples/DeadlockDocTest.java index 3ae022debe61a..04c055b20dde7 100644 --- a/community/kernel/src/test/java/examples/DeadlockDocTest.java +++ b/community/kernel/src/test/java/examples/DeadlockDocTest.java @@ -29,7 +29,7 @@ import org.neo4j.graphdb.TransactionFailureException; import org.neo4j.helpers.TransactionTemplate; import org.neo4j.kernel.DeadlockDetectedException; -import org.neo4j.test.EmbeddedDatabaseRule; +import org.neo4j.test.rule.EmbeddedDatabaseRule; public class DeadlockDocTest { diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/AbstractMandatoryTransactionsTest.java b/community/kernel/src/test/java/org/neo4j/graphdb/AbstractMandatoryTransactionsTest.java index d1e2de8626b39..ea68659c76aed 100644 --- a/community/kernel/src/test/java/org/neo4j/graphdb/AbstractMandatoryTransactionsTest.java +++ b/community/kernel/src/test/java/org/neo4j/graphdb/AbstractMandatoryTransactionsTest.java @@ -23,7 +23,7 @@ import java.util.function.Consumer; -import org.neo4j.test.EmbeddedDatabaseRule; +import org.neo4j.test.rule.EmbeddedDatabaseRule; import static org.junit.Assert.fail; diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/CreateAndDeleteNodesIT.java b/community/kernel/src/test/java/org/neo4j/graphdb/CreateAndDeleteNodesIT.java index 35380e1949446..de7498b8362c1 100644 --- a/community/kernel/src/test/java/org/neo4j/graphdb/CreateAndDeleteNodesIT.java +++ b/community/kernel/src/test/java/org/neo4j/graphdb/CreateAndDeleteNodesIT.java @@ -22,7 +22,7 @@ import org.junit.Rule; import org.junit.Test; -import org.neo4j.test.ImpermanentDatabaseRule; +import org.neo4j.test.rule.ImpermanentDatabaseRule; public class CreateAndDeleteNodesIT { diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/DeleteNodeWithRelsIT.java b/community/kernel/src/test/java/org/neo4j/graphdb/DeleteNodeWithRelsIT.java index 1e86006a5e706..2289aed348804 100644 --- a/community/kernel/src/test/java/org/neo4j/graphdb/DeleteNodeWithRelsIT.java +++ b/community/kernel/src/test/java/org/neo4j/graphdb/DeleteNodeWithRelsIT.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.junit.rules.ExpectedException; -import org.neo4j.test.ImpermanentDatabaseRule; +import org.neo4j.test.rule.ImpermanentDatabaseRule; public class DeleteNodeWithRelsIT { diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/DenseNodeIT.java b/community/kernel/src/test/java/org/neo4j/graphdb/DenseNodeIT.java index d0b9e047eb293..c37fbee25ebd8 100644 --- a/community/kernel/src/test/java/org/neo4j/graphdb/DenseNodeIT.java +++ b/community/kernel/src/test/java/org/neo4j/graphdb/DenseNodeIT.java @@ -23,10 +23,10 @@ import org.junit.Test; import org.neo4j.graphdb.factory.GraphDatabaseSettings; -import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.MyRelTypes; -import org.neo4j.test.ImpermanentDatabaseRule; +import org.neo4j.kernel.internal.GraphDatabaseAPI; +import org.neo4j.test.rule.ImpermanentDatabaseRule; import static org.junit.Assert.assertEquals; import static org.neo4j.helpers.collection.Iterables.single; 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 c02a75ff7005b..0961405a25bc9 100644 --- a/community/kernel/src/test/java/org/neo4j/graphdb/FirstStartupIT.java +++ b/community/kernel/src/test/java/org/neo4j/graphdb/FirstStartupIT.java @@ -24,8 +24,8 @@ import java.io.File; -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.neo4j.helpers.collection.Iterables.count; 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 fab142e5cd506..f09189752410b 100644 --- a/community/kernel/src/test/java/org/neo4j/graphdb/GraphDatabaseInternalLogIT.java +++ b/community/kernel/src/test/java/org/neo4j/graphdb/GraphDatabaseInternalLogIT.java @@ -29,11 +29,11 @@ import java.util.stream.Stream; import org.neo4j.graphdb.factory.GraphDatabaseSettings; -import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.impl.logging.LogService; import org.neo4j.kernel.impl.logging.StoreLogService; -import org.neo4j.test.TargetDirectory; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.TargetDirectory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.greaterThan; diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/GraphDatabaseServiceTest.java b/community/kernel/src/test/java/org/neo4j/graphdb/GraphDatabaseServiceTest.java index 9b6b2a8d41c9c..691f0c2580d84 100644 --- a/community/kernel/src/test/java/org/neo4j/graphdb/GraphDatabaseServiceTest.java +++ b/community/kernel/src/test/java/org/neo4j/graphdb/GraphDatabaseServiceTest.java @@ -31,10 +31,10 @@ import org.neo4j.kernel.DeadlockDetectedException; import org.neo4j.kernel.impl.MyRelTypes; -import org.neo4j.test.CleanupRule; import org.neo4j.test.OtherThreadExecutor; import org.neo4j.test.OtherThreadExecutor.WorkerCommand; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.CleanupRule; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.iterableWithSize; @@ -44,7 +44,10 @@ public class GraphDatabaseServiceTest { - @Rule public ExpectedException exception = ExpectedException.none(); + @Rule + public final CleanupRule cleanup = new CleanupRule(); + @Rule + public ExpectedException exception = ExpectedException.none(); @Test public void givenShutdownDatabaseWhenBeginTxThenExceptionIsThrown() throws Exception @@ -385,5 +388,4 @@ private Node createNode( GraphDatabaseService db ) } } - public final @Rule CleanupRule cleanup = new CleanupRule(); } diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/IdReuseTest.java b/community/kernel/src/test/java/org/neo4j/graphdb/IdReuseTest.java index e0f454336e625..a218db2218023 100644 --- a/community/kernel/src/test/java/org/neo4j/graphdb/IdReuseTest.java +++ b/community/kernel/src/test/java/org/neo4j/graphdb/IdReuseTest.java @@ -22,7 +22,7 @@ import org.junit.Rule; import org.junit.Test; -import org.neo4j.test.EmbeddedDatabaseRule; +import org.neo4j.test.rule.EmbeddedDatabaseRule; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/IndexingAcceptanceTest.java b/community/kernel/src/test/java/org/neo4j/graphdb/IndexingAcceptanceTest.java index e4e88dd3fa504..ca74e3d4fe5a2 100644 --- a/community/kernel/src/test/java/org/neo4j/graphdb/IndexingAcceptanceTest.java +++ b/community/kernel/src/test/java/org/neo4j/graphdb/IndexingAcceptanceTest.java @@ -37,20 +37,21 @@ import org.neo4j.kernel.api.index.IndexDescriptor; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; import org.neo4j.kernel.internal.GraphDatabaseAPI; -import org.neo4j.test.ImpermanentDatabaseRule; +import org.neo4j.test.mockito.matcher.Neo4jMatchers; +import org.neo4j.test.rule.ImpermanentDatabaseRule; import static org.hamcrest.core.IsEqual.equalTo; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; -import static org.neo4j.graphdb.Neo4jMatchers.containsOnly; -import static org.neo4j.graphdb.Neo4jMatchers.findNodesByLabelAndProperty; -import static org.neo4j.graphdb.Neo4jMatchers.hasProperty; -import static org.neo4j.graphdb.Neo4jMatchers.inTx; -import static org.neo4j.graphdb.Neo4jMatchers.isEmpty; -import static org.neo4j.graphdb.Neo4jMatchers.waitForIndex; import static org.neo4j.helpers.collection.Iterators.asSet; import static org.neo4j.helpers.collection.Iterators.count; import static org.neo4j.helpers.collection.MapUtil.map; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.containsOnly; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.findNodesByLabelAndProperty; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.hasProperty; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.inTx; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.isEmpty; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.waitForIndex; public class IndexingAcceptanceTest { diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/LabelScanStoreIT.java b/community/kernel/src/test/java/org/neo4j/graphdb/LabelScanStoreIT.java index 140e7103e1a99..7e91fcd70373a 100644 --- a/community/kernel/src/test/java/org/neo4j/graphdb/LabelScanStoreIT.java +++ b/community/kernel/src/test/java/org/neo4j/graphdb/LabelScanStoreIT.java @@ -26,8 +26,8 @@ import org.neo4j.helpers.collection.Iterables; import org.neo4j.kernel.internal.GraphDatabaseAPI; -import org.neo4j.test.DatabaseRule; -import org.neo4j.test.EmbeddedDatabaseRule; +import org.neo4j.test.rule.DatabaseRule; +import org.neo4j.test.rule.EmbeddedDatabaseRule; import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.assertEquals; diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/LabelsAcceptanceTest.java b/community/kernel/src/test/java/org/neo4j/graphdb/LabelsAcceptanceTest.java index 1547b2e58ab44..aa980038359d1 100644 --- a/community/kernel/src/test/java/org/neo4j/graphdb/LabelsAcceptanceTest.java +++ b/community/kernel/src/test/java/org/neo4j/graphdb/LabelsAcceptanceTest.java @@ -54,11 +54,11 @@ import org.neo4j.storageengine.api.LabelItem; import org.neo4j.storageengine.api.NodeItem; import org.neo4j.storageengine.api.PropertyItem; -import org.neo4j.test.ImpermanentDatabaseRule; import org.neo4j.test.ImpermanentGraphDatabase; import org.neo4j.test.TestGraphDatabaseFactory; import org.neo4j.test.TestGraphDatabaseFactoryState; import org.neo4j.test.impl.EphemeralIdGenerator; +import org.neo4j.test.rule.ImpermanentDatabaseRule; import static org.hamcrest.Matchers.hasItems; import static org.hamcrest.Matchers.not; @@ -67,15 +67,15 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; import static org.neo4j.graphdb.Label.label; -import static org.neo4j.graphdb.Neo4jMatchers.hasLabel; -import static org.neo4j.graphdb.Neo4jMatchers.hasLabels; -import static org.neo4j.graphdb.Neo4jMatchers.hasNoLabels; -import static org.neo4j.graphdb.Neo4jMatchers.hasNoNodes; -import static org.neo4j.graphdb.Neo4jMatchers.hasNodes; -import static org.neo4j.graphdb.Neo4jMatchers.inTx; import static org.neo4j.helpers.collection.Iterables.asList; import static org.neo4j.helpers.collection.Iterables.map; import static org.neo4j.helpers.collection.Iterators.asSet; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.hasLabel; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.hasLabels; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.hasNoLabels; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.hasNoNodes; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.hasNodes; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.inTx; public class LabelsAcceptanceTest { 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 d24c1d0f0b0fc..e8c66fbc223e2 100644 --- a/community/kernel/src/test/java/org/neo4j/graphdb/RunOutOfDiskSpaceIT.java +++ b/community/kernel/src/test/java/org/neo4j/graphdb/RunOutOfDiskSpaceIT.java @@ -26,14 +26,14 @@ import java.io.File; import java.io.IOException; -import org.neo4j.test.LimitedFileSystemGraphDatabase; import org.neo4j.helpers.Exceptions; import org.neo4j.io.pagecache.PageCache; import org.neo4j.kernel.impl.store.MetaDataStore; import org.neo4j.kernel.impl.transaction.log.LogVersionRepository; -import org.neo4j.test.CleanupRule; -import org.neo4j.test.PageCacheRule; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.LimitedFileSystemGraphDatabase; +import org.neo4j.test.rule.CleanupRule; +import org.neo4j.test.rule.PageCacheRule; +import org.neo4j.test.rule.TargetDirectory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -41,7 +41,8 @@ public class RunOutOfDiskSpaceIT { - public final @Rule CleanupRule cleanup = new CleanupRule(); + @Rule + public final CleanupRule cleanup = new CleanupRule(); @Test public void shouldPropagateIOExceptions() throws Exception diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/SchemaAcceptanceTest.java b/community/kernel/src/test/java/org/neo4j/graphdb/SchemaAcceptanceTest.java index dbb6e59a0973d..88369e083444c 100644 --- a/community/kernel/src/test/java/org/neo4j/graphdb/SchemaAcceptanceTest.java +++ b/community/kernel/src/test/java/org/neo4j/graphdb/SchemaAcceptanceTest.java @@ -30,7 +30,7 @@ import org.neo4j.graphdb.schema.IndexDefinition; import org.neo4j.graphdb.schema.Schema; import org.neo4j.helpers.collection.Iterables; -import org.neo4j.test.ImpermanentDatabaseRule; +import org.neo4j.test.rule.ImpermanentDatabaseRule; import static java.lang.String.format; import static org.hamcrest.CoreMatchers.containsString; @@ -40,16 +40,16 @@ import static org.hamcrest.core.IsNull.nullValue; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -import static org.neo4j.graphdb.Neo4jMatchers.contains; -import static org.neo4j.graphdb.Neo4jMatchers.containsOnly; -import static org.neo4j.graphdb.Neo4jMatchers.createIndex; -import static org.neo4j.graphdb.Neo4jMatchers.findNodesByLabelAndProperty; -import static org.neo4j.graphdb.Neo4jMatchers.getConstraints; -import static org.neo4j.graphdb.Neo4jMatchers.getIndexes; -import static org.neo4j.graphdb.Neo4jMatchers.isEmpty; -import static org.neo4j.graphdb.Neo4jMatchers.waitForIndex; import static org.neo4j.helpers.collection.Iterables.count; import static org.neo4j.helpers.collection.Iterators.asSet; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.contains; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.containsOnly; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.createIndex; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.findNodesByLabelAndProperty; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.getConstraints; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.getIndexes; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.isEmpty; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.waitForIndex; public class SchemaAcceptanceTest { diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/SchemaIndexWaitingAcceptanceTest.java b/community/kernel/src/test/java/org/neo4j/graphdb/SchemaIndexWaitingAcceptanceTest.java index 73a63a4c7dd72..531340548aeb6 100644 --- a/community/kernel/src/test/java/org/neo4j/graphdb/SchemaIndexWaitingAcceptanceTest.java +++ b/community/kernel/src/test/java/org/neo4j/graphdb/SchemaIndexWaitingAcceptanceTest.java @@ -31,8 +31,8 @@ import org.neo4j.kernel.extension.KernelExtensionFactory; import org.neo4j.kernel.impl.api.index.ControlledPopulationSchemaIndexProvider; import org.neo4j.test.DoubleLatch; -import org.neo4j.test.ImpermanentDatabaseRule; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.ImpermanentDatabaseRule; import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertThat; diff --git a/community/kernel/src/test/java/org/neo4j/helpers/progress/ProgressMonitorTest.java b/community/kernel/src/test/java/org/neo4j/helpers/progress/ProgressMonitorTest.java index d2e9999116768..9506d25ffe441 100644 --- a/community/kernel/src/test/java/org/neo4j/helpers/progress/ProgressMonitorTest.java +++ b/community/kernel/src/test/java/org/neo4j/helpers/progress/ProgressMonitorTest.java @@ -40,7 +40,7 @@ import java.util.concurrent.TimeoutException; import org.neo4j.helpers.ProcessFailureException; -import org.neo4j.test.SuppressOutput; +import org.neo4j.test.rule.SuppressOutput; import static java.lang.System.lineSeparator; import static java.util.concurrent.TimeUnit.SECONDS; 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 89af830ed17c7..b7c7408a28314 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/GraphDatabaseFacadeFactoryTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/GraphDatabaseFacadeFactoryTest.java @@ -41,7 +41,7 @@ import org.neo4j.kernel.lifecycle.LifeSupport; import org.neo4j.kernel.lifecycle.Lifecycle; import org.neo4j.kernel.monitoring.Monitors; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; 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 98ff6312ca15b..ffc45e1e6c104 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/NeoStoreDataSourceTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/NeoStoreDataSourceTest.java @@ -36,10 +36,10 @@ import org.neo4j.logging.AssertableLogProvider; import org.neo4j.logging.Logger; import org.neo4j.logging.NullLogProvider; -import org.neo4j.test.EphemeralFileSystemRule; -import org.neo4j.test.NeoStoreDataSourceRule; -import org.neo4j.test.PageCacheRule; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.NeoStoreDataSourceRule; +import org.neo4j.test.rule.PageCacheRule; +import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; 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 1874fba4cc803..2c6b3eea676ed 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/RecoveryIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/RecoveryIT.java @@ -48,8 +48,8 @@ import org.neo4j.kernel.internal.DatabaseHealth; import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.test.AdversarialPageCacheGraphDatabaseFactory; -import org.neo4j.test.TargetDirectory; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.TargetDirectory; import static org.hamcrest.Matchers.instanceOf; import static org.junit.Assert.assertEquals; 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 f9ad9182ea7f3..d81ca1291399b 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.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/TestTransactionEventDeadlocks.java b/community/kernel/src/test/java/org/neo4j/kernel/TestTransactionEventDeadlocks.java index 4ded76b21dd4b..7838450986456 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/TestTransactionEventDeadlocks.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/TestTransactionEventDeadlocks.java @@ -29,12 +29,12 @@ import org.neo4j.graphdb.event.TransactionData; import org.neo4j.graphdb.event.TransactionEventHandler; import org.neo4j.helpers.collection.Iterables; -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.junit.Assert.assertThat; -import static org.neo4j.graphdb.Neo4jMatchers.hasProperty; -import static org.neo4j.graphdb.Neo4jMatchers.inTx; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.hasProperty; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.inTx; public class TestTransactionEventDeadlocks { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/TokenCreationIT.java b/community/kernel/src/test/java/org/neo4j/kernel/TokenCreationIT.java index 9801657b57512..b4f091e6101c4 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/TokenCreationIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/TokenCreationIT.java @@ -34,8 +34,8 @@ import org.neo4j.graphdb.Label; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; -import org.neo4j.test.EmbeddedDatabaseRule; import org.neo4j.test.RepeatRule; +import org.neo4j.test.rule.EmbeddedDatabaseRule; /** * Token creation should be able to handle cases of concurrent token creation diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/index/ArrayEncoderTest.java b/community/kernel/src/test/java/org/neo4j/kernel/api/index/ArrayEncoderTest.java index 0205b6ccba088..c5c9ead51c8c0 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/index/ArrayEncoderTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/index/ArrayEncoderTest.java @@ -24,7 +24,8 @@ import org.neo4j.helpers.ArrayUtil; import org.neo4j.test.Race; -import org.neo4j.test.ThreadingRule; +import org.neo4j.test.rule.concurrent.ThreadingRule; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; 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 9524c46c1e543..e8d7edccedb31 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,8 @@ import org.neo4j.io.fs.DefaultFileSystemAbstraction; import org.neo4j.io.fs.FileSystemAbstraction; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.runner.ParameterizedSuiteRunner; @RunWith( ParameterizedSuiteRunner.class ) @Suite.SuiteClasses( { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/index/SchemaConstraintProviderApprovalTest.java b/community/kernel/src/test/java/org/neo4j/kernel/api/index/SchemaConstraintProviderApprovalTest.java index 8c744fb8e0fce..727622adf085e 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/index/SchemaConstraintProviderApprovalTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/index/SchemaConstraintProviderApprovalTest.java @@ -44,8 +44,8 @@ import static org.junit.Assert.assertEquals; import static org.neo4j.graphdb.Label.label; -import static org.neo4j.graphdb.Neo4jMatchers.createConstraint; import static org.neo4j.helpers.collection.Iterators.asSet; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.createConstraint; /* * The purpose of this test class is to make sure all index providers produce the same results. diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/index/SchemaIndexProviderApprovalTest.java b/community/kernel/src/test/java/org/neo4j/kernel/api/index/SchemaIndexProviderApprovalTest.java index 8b4a7163729ee..6c3003e9c1b26 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/index/SchemaIndexProviderApprovalTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/index/SchemaIndexProviderApprovalTest.java @@ -44,8 +44,8 @@ import static org.junit.Assert.assertEquals; import static org.neo4j.graphdb.Label.label; -import static org.neo4j.graphdb.Neo4jMatchers.createIndex; import static org.neo4j.helpers.collection.Iterators.asSet; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.createIndex; /* * The purpose of this test class is to make sure all index providers produce the same results. 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 83eb3ef8c85d7..f0f30e5ce088b 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 @@ -43,16 +43,16 @@ import org.neo4j.graphdb.Label; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; -import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.kernel.extension.KernelExtensionFactory; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; import org.neo4j.kernel.impl.locking.Lock; import org.neo4j.kernel.impl.locking.LockService; import org.neo4j.kernel.impl.spi.KernelContext; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.lifecycle.Lifecycle; -import org.neo4j.test.TargetDirectory; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.TargetDirectory; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/counts/CompositeCountsTest.java b/community/kernel/src/test/java/org/neo4j/kernel/counts/CompositeCountsTest.java index 5949eeff9ceb7..b1978311bbd8b 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/counts/CompositeCountsTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/counts/CompositeCountsTest.java @@ -33,8 +33,8 @@ import org.neo4j.kernel.api.ReadOperations; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; -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.junit.Assert.assertEquals; import static org.neo4j.graphdb.Label.label; @@ -42,7 +42,8 @@ public class CompositeCountsTest { - public final @Rule DatabaseRule db = new ImpermanentDatabaseRule(); + @Rule + public final DatabaseRule db = new ImpermanentDatabaseRule(); @Test public void shouldReportNumberOfRelationshipsFromNodesWithGivenLabel() throws Exception diff --git a/community/kernel/src/test/java/org/neo4j/kernel/counts/LabelCountsTest.java b/community/kernel/src/test/java/org/neo4j/kernel/counts/LabelCountsTest.java index 262c50165127c..80ad345510e64 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/counts/LabelCountsTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/counts/LabelCountsTest.java @@ -32,15 +32,16 @@ import org.neo4j.kernel.api.ReadOperations; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; -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.junit.Assert.assertEquals; import static org.neo4j.graphdb.Label.label; public class LabelCountsTest { - public final @Rule DatabaseRule db = new ImpermanentDatabaseRule(); + @Rule + public final DatabaseRule db = new ImpermanentDatabaseRule(); @Test public void shouldGetNumberOfNodesWithLabel() throws Exception diff --git a/community/kernel/src/test/java/org/neo4j/kernel/counts/NodeCountsTest.java b/community/kernel/src/test/java/org/neo4j/kernel/counts/NodeCountsTest.java index e9a8217be4803..f2a70eb019664 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/counts/NodeCountsTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/counts/NodeCountsTest.java @@ -33,17 +33,19 @@ import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; import org.neo4j.test.Barrier; -import org.neo4j.test.DatabaseRule; -import org.neo4j.test.ImpermanentDatabaseRule; import org.neo4j.test.NamedFunction; -import org.neo4j.test.ThreadingRule; +import org.neo4j.test.rule.DatabaseRule; +import org.neo4j.test.rule.ImpermanentDatabaseRule; +import org.neo4j.test.rule.concurrent.ThreadingRule; import static org.junit.Assert.assertEquals; public class NodeCountsTest { - public final @Rule DatabaseRule db = new ImpermanentDatabaseRule(); - public final @Rule ThreadingRule threading = new ThreadingRule(); + @Rule + public final DatabaseRule db = new ImpermanentDatabaseRule(); + @Rule + public final ThreadingRule threading = new ThreadingRule(); @Test public void shouldReportNumberOfNodesInAnEmptyGraph() throws Exception diff --git a/community/kernel/src/test/java/org/neo4j/kernel/counts/RelationshipCountsTest.java b/community/kernel/src/test/java/org/neo4j/kernel/counts/RelationshipCountsTest.java index ea906477a81bd..cac736f26b89e 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/counts/RelationshipCountsTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/counts/RelationshipCountsTest.java @@ -36,10 +36,10 @@ import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; import org.neo4j.test.Barrier; -import org.neo4j.test.DatabaseRule; -import org.neo4j.test.ImpermanentDatabaseRule; import org.neo4j.test.NamedFunction; -import org.neo4j.test.ThreadingRule; +import org.neo4j.test.rule.DatabaseRule; +import org.neo4j.test.rule.ImpermanentDatabaseRule; +import org.neo4j.test.rule.concurrent.ThreadingRule; import static org.junit.Assert.assertEquals; import static org.neo4j.graphdb.Label.label; @@ -47,8 +47,10 @@ public class RelationshipCountsTest { - public final @Rule DatabaseRule db = new ImpermanentDatabaseRule(); - public final @Rule ThreadingRule threading = new ThreadingRule(); + @Rule + public final DatabaseRule db = new ImpermanentDatabaseRule(); + @Rule + public final ThreadingRule threading = new ThreadingRule(); @Test public void shouldReportNumberOfRelationshipsInAnEmptyGraph() throws Exception 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 635f11acc2cf9..8929bb9fa8f7d 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 @@ -29,8 +29,8 @@ import org.neo4j.helpers.collection.MapUtil; import org.neo4j.kernel.internal.EmbeddedGraphDatabase; import org.neo4j.kernel.internal.GraphDatabaseAPI; -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; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/DataAndSchemaTransactionSeparationIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/DataAndSchemaTransactionSeparationIT.java index c9419a220e867..322f5338aeff7 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/DataAndSchemaTransactionSeparationIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/DataAndSchemaTransactionSeparationIT.java @@ -29,8 +29,8 @@ import org.neo4j.graphdb.PropertyContainer; import org.neo4j.graphdb.Relationship; import org.neo4j.helpers.collection.Pair; -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.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -39,7 +39,8 @@ public class DataAndSchemaTransactionSeparationIT { - public final @Rule DatabaseRule db = new ImpermanentDatabaseRule(); + @Rule + public final DatabaseRule db = new ImpermanentDatabaseRule(); private static Function expectFailureAfterSchemaOperation( final Function function ) diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelSchemaStateFlushingTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelSchemaStateFlushingTest.java index 1f9fa945260ba..101937fc50fd9 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelSchemaStateFlushingTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelSchemaStateFlushingTest.java @@ -26,7 +26,6 @@ import java.util.concurrent.locks.LockSupport; -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; @@ -35,9 +34,10 @@ import org.neo4j.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; import org.neo4j.kernel.api.index.IndexDescriptor; +import org.neo4j.kernel.api.security.AccessMode; import org.neo4j.kernel.impl.api.index.SchemaIndexTestHelper; import org.neo4j.kernel.internal.GraphDatabaseAPI; -import org.neo4j.test.ImpermanentDatabaseRule; +import org.neo4j.test.rule.ImpermanentDatabaseRule; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.junit.Assert.assertEquals; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/LegacyBatchIndexApplierTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/LegacyBatchIndexApplierTest.java index 94a5a536079aa..ce03dfeaa6595 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/LegacyBatchIndexApplierTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/LegacyBatchIndexApplierTest.java @@ -43,8 +43,8 @@ import org.neo4j.kernel.impl.transaction.log.TransactionIdStore; import org.neo4j.kernel.impl.util.SynchronizedArrayIdOrderingQueue; import org.neo4j.kernel.lifecycle.LifeRule; -import org.neo4j.test.EphemeralFileSystemRule; import org.neo4j.test.Race; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static org.junit.Assert.assertTrue; import static org.mockito.Matchers.anyBoolean; @@ -54,7 +54,6 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; - import static org.neo4j.helpers.collection.MapUtil.stringMap; import static org.neo4j.kernel.impl.util.IdOrderingQueue.BYPASS; import static org.neo4j.storageengine.api.TransactionApplicationMode.INTERNAL; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/LongDiffSetsTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/LongDiffSetsTest.java index 90930f30feada..50b1a4a69dce0 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/LongDiffSetsTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/LongDiffSetsTest.java @@ -19,17 +19,18 @@ */ package org.neo4j.kernel.impl.api; -import static java.util.Arrays.asList; -import static org.junit.Assert.assertThat; -import static org.neo4j.collection.primitive.PrimitiveLongCollections.iterator; -import static org.neo4j.graphdb.Neo4jMatchers.hasSamePrimitiveItems; +import org.junit.Test; import java.util.Iterator; -import org.junit.Test; import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.kernel.impl.util.diffsets.DiffSets; +import static java.util.Arrays.asList; +import static org.junit.Assert.assertThat; +import static org.neo4j.collection.primitive.PrimitiveLongCollections.iterator; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.hasSamePrimitiveItems; + public class LongDiffSetsTest { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/OperationsFacadeTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/OperationsFacadeTest.java index 57dacf7c20801..10e10e67b5abc 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/OperationsFacadeTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/OperationsFacadeTest.java @@ -35,7 +35,7 @@ import org.neo4j.kernel.api.exceptions.schema.SchemaRuleNotFoundException; import org.neo4j.kernel.api.index.IndexDescriptor; import org.neo4j.kernel.impl.api.operations.SchemaReadOperations; -import org.neo4j.test.KernelExceptionUserMessageMatcher; +import org.neo4j.test.mockito.matcher.KernelExceptionUserMessageMatcher; @RunWith( MockitoJUnitRunner.class ) public class OperationsFacadeTest diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/SchemaLoggingIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/SchemaLoggingIT.java index 261ca1f63a667..01d68d09f516e 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/SchemaLoggingIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/SchemaLoggingIT.java @@ -29,7 +29,7 @@ import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.logging.AssertableLogProvider; import org.neo4j.logging.AssertableLogProvider.LogMatcherBuilder; -import org.neo4j.test.ImpermanentDatabaseRule; +import org.neo4j.test.rule.ImpermanentDatabaseRule; import static org.neo4j.graphdb.Label.label; import static org.neo4j.logging.AssertableLogProvider.inLog; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/TransactionRepresentationCommitProcessIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/TransactionRepresentationCommitProcessIT.java index f00a7be7ef442..a853ee7f7b95d 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/TransactionRepresentationCommitProcessIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/TransactionRepresentationCommitProcessIT.java @@ -36,17 +36,14 @@ import org.neo4j.kernel.impl.store.NeoStores; import org.neo4j.kernel.impl.transaction.log.checkpoint.CheckPointer; import org.neo4j.kernel.impl.transaction.log.checkpoint.SimpleTriggerInfo; -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.unsafe.impl.batchimport.cache.idmapping.string.Workers; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.assertEquals; - import static java.util.concurrent.TimeUnit.SECONDS; - +import static org.hamcrest.Matchers.greaterThan; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; import static org.neo4j.helpers.collection.MapUtil.stringMap; public class TransactionRepresentationCommitProcessIT diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/FlippableIndexProxyTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/FlippableIndexProxyTest.java index 2239a752b3b33..db212f4bd9d1c 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/FlippableIndexProxyTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/FlippableIndexProxyTest.java @@ -30,8 +30,8 @@ import org.neo4j.kernel.api.exceptions.index.FlipFailedKernelException; import org.neo4j.kernel.api.exceptions.index.IndexProxyAlreadyClosedKernelException; -import org.neo4j.test.CleanupRule; import org.neo4j.test.OtherThreadExecutor; +import org.neo4j.test.rule.CleanupRule; import static java.util.concurrent.TimeUnit.SECONDS; import static org.junit.Assert.assertTrue; @@ -45,6 +45,8 @@ public class FlippableIndexProxyTest { + @Rule + public final CleanupRule cleanup = new CleanupRule(); @Rule public ExpectedException expectedException = ExpectedException.none(); @@ -149,8 +151,6 @@ public void shouldBlockAccessDuringFlipAndThenDelegateToCorrectContext() throws verify( contextAfterFlip ).drop(); } - public final @Rule CleanupRule cleanup = new CleanupRule(); - private OtherThreadExecutor.WorkerCommand dropTheIndex( final FlippableIndexProxy flippable ) { return new OtherThreadExecutor.WorkerCommand() diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexCRUDIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexCRUDIT.java index 0cf761776695b..56fbfe52c9e94 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexCRUDIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexCRUDIT.java @@ -56,8 +56,8 @@ import org.neo4j.kernel.impl.storemigration.StoreMigrationParticipant; import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.storageengine.api.schema.IndexSample; -import org.neo4j.test.EphemeralFileSystemRule; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.assertThat; @@ -66,11 +66,11 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.neo4j.graphdb.DynamicLabel.label; -import static org.neo4j.graphdb.Neo4jMatchers.createIndex; import static org.neo4j.helpers.collection.Iterators.asSet; import static org.neo4j.helpers.collection.MapUtil.map; import static org.neo4j.kernel.impl.api.index.SchemaIndexTestHelper.singleInstanceSchemaIndexProviderFactory; import static org.neo4j.kernel.impl.api.index.TestSchemaIndexProviderDescriptor.PROVIDER_DESCRIPTOR; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.createIndex; public class IndexCRUDIT { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexPopulationJobTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexPopulationJobTest.java index d1558faf8b5b5..addeccd356d09 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexPopulationJobTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexPopulationJobTest.java @@ -42,7 +42,6 @@ import org.neo4j.helpers.collection.MapUtil; import org.neo4j.helpers.collection.Pair; import org.neo4j.helpers.collection.Visitor; -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; @@ -58,6 +57,7 @@ import org.neo4j.kernel.api.index.PreexistingIndexEntryConflictException; import org.neo4j.kernel.api.index.PropertyAccessor; import org.neo4j.kernel.api.labelscan.NodeLabelUpdate; +import org.neo4j.kernel.api.security.AccessMode; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.KernelSchemaStateStore; import org.neo4j.kernel.impl.api.index.inmemory.InMemoryIndexProvider; @@ -70,11 +70,11 @@ import org.neo4j.register.Register.DoubleLongRegister; import org.neo4j.register.Registers; import org.neo4j.storageengine.api.schema.PopulationProgress; -import org.neo4j.test.CleanupRule; import org.neo4j.test.DoubleLatch; import org.neo4j.test.OtherThreadExecutor; import org.neo4j.test.OtherThreadExecutor.WorkerCommand; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.CleanupRule; import static java.lang.String.format; import static org.hamcrest.MatcherAssert.assertThat; @@ -103,6 +103,45 @@ public class IndexPopulationJobTest { + @Rule + public final CleanupRule cleanup = new CleanupRule(); + + private GraphDatabaseAPI db; + + private final Label FIRST = Label.label( "FIRST" ); + private final Label SECOND = Label.label( "SECOND" ); + private final String name = "name"; + private final String age = "age"; + + private KernelAPI kernel; + private IndexStoreView indexStoreView; + private KernelSchemaStateStore stateHolder; + + private int labelId; + + @Before + public void before() throws Exception + { + db = (GraphDatabaseAPI) new TestGraphDatabaseFactory().newImpermanentDatabase(); + kernel = db.getDependencyResolver().resolveDependency( KernelAPI.class ); + stateHolder = new KernelSchemaStateStore( NullLogProvider.getInstance() ); + indexStoreView = indexStoreView(); + + try ( KernelTransaction tx = kernel.newTransaction( KernelTransaction.Type.implicit, AccessMode.Static.FULL ); + Statement statement = tx.acquireStatement() ) + { + labelId = statement.schemaWriteOperations().labelGetOrCreateForName( FIRST.name() ); + statement.schemaWriteOperations().labelGetOrCreateForName( SECOND.name() ); + tx.success(); + } + } + + @After + public void after() throws Exception + { + db.shutdown(); + } + @Test public void shouldPopulateIndexWithOneNode() throws Exception { @@ -586,43 +625,6 @@ private IndexPopulator inMemoryPopulator( boolean constraint ) throws Transactio return new InMemoryIndexProvider().getPopulator( 21, descriptor, indexConfig, samplingConfig ); } - private GraphDatabaseAPI db; - - private final Label FIRST = Label.label( "FIRST" ); - private final Label SECOND = Label.label( "SECOND" ); - private final String name = "name"; - private final String age = "age"; - - private KernelAPI kernel; - private IndexStoreView indexStoreView; - private KernelSchemaStateStore stateHolder; - - private int labelId; - public final @Rule CleanupRule cleanup = new CleanupRule(); - - @Before - public void before() throws Exception - { - db = (GraphDatabaseAPI) new TestGraphDatabaseFactory().newImpermanentDatabase(); - kernel = db.getDependencyResolver().resolveDependency( KernelAPI.class ); - stateHolder = new KernelSchemaStateStore( NullLogProvider.getInstance() ); - indexStoreView = indexStoreView(); - - try ( KernelTransaction tx = kernel.newTransaction( KernelTransaction.Type.implicit, AccessMode.Static.FULL ); - Statement statement = tx.acquireStatement() ) - { - labelId = statement.schemaWriteOperations().labelGetOrCreateForName( FIRST.name() ); - statement.schemaWriteOperations().labelGetOrCreateForName( SECOND.name() ); - tx.success(); - } - } - - @After - public void after() throws Exception - { - db.shutdown(); - } - private IndexPopulationJob newIndexPopulationJob( Label label, String propertyKey, IndexPopulator populator, FlippableIndexProxy flipper, boolean constraint ) throws TransactionFailureException diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexRecoveryIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexRecoveryIT.java index 2b24402f830b5..2d892c7cb6e20 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexRecoveryIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexRecoveryIT.java @@ -42,7 +42,6 @@ import org.neo4j.graphdb.schema.Schema; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; -import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; import org.neo4j.kernel.api.index.IndexAccessor; @@ -62,9 +61,10 @@ 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.kernel.internal.GraphDatabaseAPI; import org.neo4j.storageengine.api.schema.IndexSample; -import org.neo4j.test.EphemeralFileSystemRule; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static java.util.concurrent.Executors.newSingleThreadExecutor; import static java.util.concurrent.TimeUnit.SECONDS; @@ -78,11 +78,11 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.neo4j.graphdb.Label.label; -import static org.neo4j.graphdb.Neo4jMatchers.getIndexes; -import static org.neo4j.graphdb.Neo4jMatchers.hasSize; -import static org.neo4j.graphdb.Neo4jMatchers.haveState; -import static org.neo4j.graphdb.Neo4jMatchers.inTx; import static org.neo4j.kernel.impl.api.index.SchemaIndexTestHelper.singleInstanceSchemaIndexProviderFactory; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.getIndexes; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.hasSize; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.haveState; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.inTx; public class IndexRecoveryIT { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexRestartIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexRestartIT.java index 66b75666f8263..3f793b3d65294 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexRestartIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexRestartIT.java @@ -35,22 +35,22 @@ import org.neo4j.graphdb.schema.Schema; import org.neo4j.kernel.extension.KernelExtensionFactory; import org.neo4j.test.DoubleLatch; -import org.neo4j.test.EphemeralFileSystemRule; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; import static org.neo4j.graphdb.Label.label; -import static org.neo4j.graphdb.Neo4jMatchers.getIndexState; -import static org.neo4j.graphdb.Neo4jMatchers.getIndexes; -import static org.neo4j.graphdb.Neo4jMatchers.hasSize; -import static org.neo4j.graphdb.Neo4jMatchers.haveState; -import static org.neo4j.graphdb.Neo4jMatchers.inTx; import static org.neo4j.kernel.api.index.InternalIndexState.ONLINE; import static org.neo4j.kernel.api.index.InternalIndexState.POPULATING; import static org.neo4j.kernel.impl.api.index.SchemaIndexTestHelper.singleInstanceSchemaIndexProviderFactory; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.getIndexState; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.getIndexes; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.hasSize; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.haveState; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.inTx; public class IndexRestartIT { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexSamplingCancellationTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexSamplingCancellationTest.java index 3f0a21df4b19a..aeeab5dc30f6e 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexSamplingCancellationTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexSamplingCancellationTest.java @@ -38,9 +38,9 @@ import org.neo4j.storageengine.api.schema.IndexSample; import org.neo4j.storageengine.api.schema.IndexSampler; import org.neo4j.test.Barrier; -import org.neo4j.test.DatabaseRule; -import org.neo4j.test.ImpermanentDatabaseRule; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.DatabaseRule; +import org.neo4j.test.rule.ImpermanentDatabaseRule; import static java.util.concurrent.TimeUnit.SECONDS; import static org.hamcrest.Matchers.instanceOf; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexStatisticsIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexStatisticsIT.java index c024865e95a9a..5821fc0a778d0 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexStatisticsIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexStatisticsIT.java @@ -44,8 +44,8 @@ import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.logging.AssertableLogProvider; import org.neo4j.register.Register.DoubleLongRegister; -import org.neo4j.test.EphemeralFileSystemRule; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static org.junit.Assert.assertEquals; import static org.neo4j.graphdb.Label.label; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexStatisticsTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexStatisticsTest.java index 31be80bc7e623..df4c84bf0505f 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexStatisticsTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexStatisticsTest.java @@ -45,7 +45,6 @@ import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.factory.GraphDatabaseBuilder; import org.neo4j.graphdb.factory.GraphDatabaseSettings; -import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.kernel.api.exceptions.KernelException; @@ -55,11 +54,12 @@ import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageEngine; import org.neo4j.kernel.impl.store.counts.CountsTracker; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.monitoring.Monitors; import org.neo4j.register.Register.DoubleLongRegister; import org.neo4j.register.Registers; -import org.neo4j.test.DatabaseRule; -import org.neo4j.test.EmbeddedDatabaseRule; +import org.neo4j.test.rule.DatabaseRule; +import org.neo4j.test.rule.EmbeddedDatabaseRule; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceTest.java index 455573d6494d6..e15a4ec229e9d 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceTest.java @@ -129,7 +129,7 @@ import static org.neo4j.kernel.impl.store.record.IndexRule.indexRule; import static org.neo4j.logging.AssertableLogProvider.inLog; import static org.neo4j.register.Registers.newDoubleLongRegister; -import static org.neo4j.test.AwaitAnswer.afterAwaiting; +import static org.neo4j.test.mockito.answer.AwaitAnswer.afterAwaiting; public class IndexingServiceTest { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/PropertyPhysicalToLogicalConverterTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/PropertyPhysicalToLogicalConverterTest.java index 0a8059cd5f551..e6610da0b0ec9 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/PropertyPhysicalToLogicalConverterTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/PropertyPhysicalToLogicalConverterTest.java @@ -43,8 +43,8 @@ import org.neo4j.kernel.impl.store.record.PropertyRecord; import org.neo4j.kernel.impl.transaction.state.PropertyRecordChange; import org.neo4j.logging.NullLogProvider; -import org.neo4j.test.EphemeralFileSystemRule; -import org.neo4j.test.PageCacheRule; +import org.neo4j.test.rule.PageCacheRule; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static org.junit.Assert.assertEquals; import static org.neo4j.helpers.collection.Iterables.asList; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/RelationshipIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/RelationshipIT.java index 29a3695e44803..782e00acb9d85 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/RelationshipIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/RelationshipIT.java @@ -36,7 +36,7 @@ import org.neo4j.kernel.api.DataWriteOperations; import org.neo4j.kernel.api.ReadOperations; import org.neo4j.test.OtherThreadExecutor; -import org.neo4j.test.OtherThreadRule; +import org.neo4j.test.rule.concurrent.OtherThreadRule; import static org.hamcrest.CoreMatchers.hasItem; import static org.hamcrest.core.AllOf.allOf; 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 49f5421d2d41a..7272031de7e6f 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 @@ -30,8 +30,8 @@ import org.neo4j.graphdb.schema.ConstraintDefinition; import org.neo4j.graphdb.schema.IndexDefinition; import org.neo4j.helpers.collection.Iterables; -import org.neo4j.test.TargetDirectory; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.TargetDirectory; import org.neo4j.test.subprocess.SubProcess; import static org.junit.Assert.assertEquals; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/UniquenessConstraintValidationConcurrencyIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/UniquenessConstraintValidationConcurrencyIT.java index 71fd17b52498a..09fec08bfb960 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/UniquenessConstraintValidationConcurrencyIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/UniquenessConstraintValidationConcurrencyIT.java @@ -28,21 +28,23 @@ import org.neo4j.graphdb.ConstraintViolationException; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Transaction; -import org.neo4j.test.DatabaseRule; -import org.neo4j.test.ImpermanentDatabaseRule; import org.neo4j.test.OtherThreadExecutor; -import org.neo4j.test.OtherThreadRule; +import org.neo4j.test.rule.DatabaseRule; +import org.neo4j.test.rule.ImpermanentDatabaseRule; +import org.neo4j.test.rule.concurrent.OtherThreadRule; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.neo4j.graphdb.Label.label; -import static org.neo4j.test.OtherThreadRule.isWaiting; +import static org.neo4j.test.rule.concurrent.OtherThreadRule.isWaiting; public class UniquenessConstraintValidationConcurrencyIT { - public final @Rule DatabaseRule database = new ImpermanentDatabaseRule(); - public final @Rule OtherThreadRule otherThread = new OtherThreadRule<>(); + @Rule + public final DatabaseRule database = new ImpermanentDatabaseRule(); + @Rule + public final OtherThreadRule otherThread = new OtherThreadRule<>(); @Test public void shouldAllowConcurrentCreationOfNonConflictingData() throws Exception diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/IndexQueryTransactionStateTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/IndexQueryTransactionStateTest.java index 6a6e0ca6775b4..eb4c8c1a70141 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/IndexQueryTransactionStateTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/IndexQueryTransactionStateTest.java @@ -53,8 +53,6 @@ import static org.junit.Assert.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.neo4j.graphdb.Neo4jMockitoHelpers.answerAsIteratorFrom; -import static org.neo4j.graphdb.Neo4jMockitoHelpers.answerAsPrimitiveLongIteratorFrom; import static org.neo4j.helpers.collection.Iterators.asSet; import static org.neo4j.kernel.api.StatementConstants.NO_SUCH_NODE; import static org.neo4j.kernel.api.properties.Property.noNodeProperty; @@ -62,6 +60,8 @@ import static org.neo4j.kernel.impl.api.state.StubCursors.asLabelCursor; import static org.neo4j.kernel.impl.api.state.StubCursors.asNodeCursor; import static org.neo4j.kernel.impl.api.state.StubCursors.asPropertyCursor; +import static org.neo4j.test.mockito.answer.Neo4jMockitoAnswers.answerAsIteratorFrom; +import static org.neo4j.test.mockito.answer.Neo4jMockitoAnswers.answerAsPrimitiveLongIteratorFrom; public class IndexQueryTransactionStateTest { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/LabelTransactionStateTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/LabelTransactionStateTest.java index 5add898d29255..40ba77abf8428 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/LabelTransactionStateTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/LabelTransactionStateTest.java @@ -48,12 +48,12 @@ import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.neo4j.graphdb.Neo4jMockitoHelpers.answerAsIteratorFrom; -import static org.neo4j.graphdb.Neo4jMockitoHelpers.answerAsPrimitiveLongIteratorFrom; import static org.neo4j.helpers.collection.Iterators.asSet; import static org.neo4j.kernel.impl.api.state.StubCursors.asLabelCursor; import static org.neo4j.kernel.impl.api.state.StubCursors.asNodeCursor; import static org.neo4j.kernel.impl.api.state.StubCursors.asPropertyCursor; +import static org.neo4j.test.mockito.answer.Neo4jMockitoAnswers.answerAsIteratorFrom; +import static org.neo4j.test.mockito.answer.Neo4jMockitoAnswers.answerAsPrimitiveLongIteratorFrom; public class LabelTransactionStateTest { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/NoChangeWriteTransactionTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/NoChangeWriteTransactionTest.java index a6fc578b91172..48733417bbcd8 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/NoChangeWriteTransactionTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/NoChangeWriteTransactionTest.java @@ -26,11 +26,11 @@ import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.index.Index; -import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.impl.transaction.log.TransactionIdStore; -import org.neo4j.test.DatabaseRule; -import org.neo4j.test.ImpermanentDatabaseRule; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.test.TestLabels; +import org.neo4j.test.rule.DatabaseRule; +import org.neo4j.test.rule.ImpermanentDatabaseRule; import static org.junit.Assert.assertEquals; import static org.neo4j.graphdb.index.IndexManager.PROVIDER; @@ -39,6 +39,9 @@ public class NoChangeWriteTransactionTest { + @Rule + public final DatabaseRule dbr = new ImpermanentDatabaseRule(); + @Test public void shouldIdentifyTransactionWithNetZeroChangesAsReadOnly() throws Exception { @@ -105,5 +108,4 @@ private Node createEmptyNode( GraphDatabaseService db ) } } - public final @Rule DatabaseRule dbr = new ImpermanentDatabaseRule(); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/TxStateTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/TxStateTest.java index ab7b9833da381..9e43760e7d65f 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/TxStateTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/TxStateTest.java @@ -56,8 +56,8 @@ import org.neo4j.storageengine.api.RelationshipItem; import org.neo4j.storageengine.api.txstate.ReadableDiffSets; import org.neo4j.storageengine.api.txstate.TxStateVisitor; -import org.neo4j.test.RandomRule; import org.neo4j.test.RepeatRule; +import org.neo4j.test.rule.RandomRule; import static java.util.Arrays.asList; import static java.util.Collections.emptySet; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/DiskLayerLabelTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/DiskLayerLabelTest.java index 6c38188627c4e..a96f6257279bf 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/DiskLayerLabelTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/DiskLayerLabelTest.java @@ -37,10 +37,10 @@ import static java.util.Arrays.asList; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; -import static org.neo4j.graphdb.Neo4jMatchers.containsOnly; -import static org.neo4j.graphdb.Neo4jMatchers.getPropertyKeys; import static org.neo4j.helpers.collection.Iterators.asSet; import static org.neo4j.helpers.collection.MapUtil.map; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.containsOnly; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.getPropertyKeys; /** * Test read access to committed label data. diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StorePropertyCursorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StorePropertyCursorTest.java index eda755a0873aa..a640810b502ba 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StorePropertyCursorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StorePropertyCursorTest.java @@ -56,8 +56,8 @@ import org.neo4j.logging.LogProvider; import org.neo4j.logging.NullLogProvider; import org.neo4j.storageengine.api.PropertyItem; -import org.neo4j.test.EphemeralFileSystemRule; -import org.neo4j.test.PageCacheRule; +import org.neo4j.test.rule.PageCacheRule; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StorePropertyPayloadCursorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StorePropertyPayloadCursorTest.java index a2eb399ce537b..4d834af0afda9 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StorePropertyPayloadCursorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StorePropertyPayloadCursorTest.java @@ -55,7 +55,7 @@ import static org.neo4j.kernel.impl.api.store.StorePropertyPayloadCursorTest.Param.param; import static org.neo4j.kernel.impl.api.store.StorePropertyPayloadCursorTest.Param.paramArg; import static org.neo4j.kernel.impl.api.store.StorePropertyPayloadCursorTest.Params.params; -import static org.neo4j.test.Assert.assertObjectOrArrayEquals; +import static org.neo4j.test.assertion.Assert.assertObjectOrArrayEquals; @RunWith( Enclosed.class ) public class StorePropertyPayloadCursorTest diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/TestReferenceDangling.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/TestReferenceDangling.java index c0084b7ec9252..430c0aa9524be 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/TestReferenceDangling.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/TestReferenceDangling.java @@ -24,9 +24,9 @@ import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; -import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.impl.transaction.state.DataSourceManager; -import org.neo4j.test.ImpermanentDatabaseRule; +import org.neo4j.kernel.internal.GraphDatabaseAPI; +import org.neo4j.test.rule.ImpermanentDatabaseRule; /** * This test ensures that lazy properties diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/cache/MeasureDoNothingManualVerification.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/cache/MeasureDoNothingManualVerification.java deleted file mode 100644 index fdd7968318398..0000000000000 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/cache/MeasureDoNothingManualVerification.java +++ /dev/null @@ -1,79 +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.kernel.impl.cache; - -import java.nio.ByteBuffer; -import java.util.Map; -import java.util.Random; -import java.util.concurrent.Callable; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; - -import org.neo4j.logging.FormattedLog; -import org.neo4j.logging.Log; - -import static java.util.Arrays.asList; - -public class MeasureDoNothingManualVerification -{ - /** - * MeasureDoNothing depends on full-thread pauses to validate that it works, which frankly is hard to do in a test. - * We could mock out the wait() call, but that is the exact thing we'd want to test - does it in fact catch full - * thread pauses? - * - * So, instead, here's a manual method for causing a log of garbage and tracking the logging that comes out. - */ - - public static void main(String ... args) throws InterruptedException, ExecutionException - { - Log log = FormattedLog.toOutputStream( System.out ); - new Thread(new MeasureDoNothing( "GC Monitor", log, 100, 1 )).start(); - - ExecutorService executorService = Executors.newFixedThreadPool( 4 ); - for ( Future objectFuture : executorService.invokeAll( - asList( new GCHeavyJob(),new GCHeavyJob(),new GCHeavyJob(),new GCHeavyJob() ) ) ) - { - objectFuture.get(); - } - } - - private static class GCHeavyJob implements Callable - { - Map objects = new ConcurrentHashMap<>(); - Random rand = new Random(); - - @Override - public Object call() throws Exception - { - while(true) - { - objects.put("key" + rand.nextInt(1_000), ByteBuffer.allocate( 8192 )); - if(false) - { - break; - } - } - return null; - } - } -} diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/BigStoreIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/BigStoreIT.java index e481c1259320e..f28124668a3d2 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/BigStoreIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/BigStoreIT.java @@ -45,7 +45,7 @@ import org.neo4j.kernel.impl.store.id.IdGeneratorFactory; import org.neo4j.kernel.impl.store.id.IdType; import org.neo4j.kernel.internal.GraphDatabaseAPI; -import org.neo4j.test.EmbeddedDatabaseRule; +import org.neo4j.test.rule.EmbeddedDatabaseRule; import static java.lang.Math.pow; import static java.util.Arrays.asList; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/ConcurrentCreateAndGetRelationshipsIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/ConcurrentCreateAndGetRelationshipsIT.java index 0d30fb09818be..2b5d22b515ec3 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/ConcurrentCreateAndGetRelationshipsIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/ConcurrentCreateAndGetRelationshipsIT.java @@ -35,7 +35,7 @@ import org.neo4j.helpers.collection.Iterables; import org.neo4j.kernel.impl.MyRelTypes; import org.neo4j.kernel.impl.api.store.RelationshipIterator; -import org.neo4j.test.ImpermanentDatabaseRule; +import org.neo4j.test.rule.ImpermanentDatabaseRule; import static java.lang.Thread.sleep; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/LargePropertiesIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/LargePropertiesIT.java index ad6389daa2eff..d42f5c90f5e64 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/LargePropertiesIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/LargePropertiesIT.java @@ -27,8 +27,8 @@ import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.factory.GraphDatabaseSettings; -import org.neo4j.test.EphemeralFileSystemRule; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/ManyPropertyKeysIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/ManyPropertyKeysIT.java index 912e34ace2162..2068630837c46 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 @@ -33,11 +33,11 @@ import org.neo4j.helpers.collection.Iterables; import org.neo4j.io.fs.DefaultFileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; -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; import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.kernel.api.security.AccessMode; import org.neo4j.kernel.impl.store.NeoStores; import org.neo4j.kernel.impl.store.PropertyKeyTokenStore; import org.neo4j.kernel.impl.store.PropertyStore; @@ -49,9 +49,9 @@ import org.neo4j.logging.NullLogProvider; import org.neo4j.test.OtherThreadExecutor; import org.neo4j.test.OtherThreadExecutor.WorkerCommand; -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; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/NodeTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/NodeTest.java index 1c3b84bb57c48..1bf2bc8ad34ce 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/NodeTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/NodeTest.java @@ -36,9 +36,9 @@ import org.neo4j.graphdb.PropertyContainer; import org.neo4j.graphdb.RelationshipType; import org.neo4j.graphdb.Transaction; -import org.neo4j.test.DatabaseRule; -import org.neo4j.test.GraphTransactionRule; -import org.neo4j.test.ImpermanentDatabaseRule; +import org.neo4j.test.rule.DatabaseRule; +import org.neo4j.test.rule.GraphTransactionRule; +import org.neo4j.test.rule.ImpermanentDatabaseRule; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/PropertyContainerProxyTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/PropertyContainerProxyTest.java index b244303962b2d..b67c8da2525fd 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/PropertyContainerProxyTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/PropertyContainerProxyTest.java @@ -27,12 +27,12 @@ import org.neo4j.graphdb.PropertyContainer; import org.neo4j.graphdb.Transaction; -import org.neo4j.test.CleanupRule; -import org.neo4j.test.DatabaseRule; -import org.neo4j.test.ImpermanentDatabaseRule; +import org.neo4j.test.rule.CleanupRule; +import org.neo4j.test.rule.DatabaseRule; +import org.neo4j.test.rule.ImpermanentDatabaseRule; import static org.junit.Assert.assertEquals; -import static org.neo4j.test.Assert.assertObjectOrArrayEquals; +import static org.neo4j.test.assertion.Assert.assertObjectOrArrayEquals; public abstract class PropertyContainerProxyTest { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestConcurrentIteratorModification.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestConcurrentIteratorModification.java index 3d372ab59f26e..cb7a4047c4a01 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestConcurrentIteratorModification.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestConcurrentIteratorModification.java @@ -30,7 +30,7 @@ import org.neo4j.graphdb.Node; import org.neo4j.graphdb.ResourceIterator; import org.neo4j.graphdb.Transaction; -import org.neo4j.test.EmbeddedDatabaseRule; +import org.neo4j.test.rule.EmbeddedDatabaseRule; import static org.junit.Assert.assertEquals; import static org.neo4j.helpers.collection.Iterators.asSet; 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 2c9ef0c983724..a99c28613f8a6 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 @@ -47,20 +47,20 @@ import org.neo4j.kernel.impl.store.NeoStores; import org.neo4j.kernel.impl.store.id.IdType; import org.neo4j.kernel.internal.GraphDatabaseAPI; -import org.neo4j.test.EphemeralFileSystemRule; -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.test.rule.filesystem.EphemeralFileSystemRule; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; -import static org.neo4j.graphdb.Neo4jMatchers.hasProperty; -import static org.neo4j.graphdb.Neo4jMatchers.inTx; import static org.neo4j.kernel.configuration.Settings.FALSE; -import static org.neo4j.test.EphemeralFileSystemRule.shutdownDbAction; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.hasProperty; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.inTx; +import static org.neo4j.test.rule.filesystem.EphemeralFileSystemRule.shutdownDbAction; /** * Test for making sure that slow id generator rebuild is exercised diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestDenseNodeRelChainPositionIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestDenseNodeRelChainPositionIT.java index 04d1c71ffdeba..81472428ed5d2 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestDenseNodeRelChainPositionIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestDenseNodeRelChainPositionIT.java @@ -29,8 +29,9 @@ import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.factory.GraphDatabaseSettings; import org.neo4j.helpers.collection.Iterables; -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.junit.Assert.assertEquals; public class TestDenseNodeRelChainPositionIT diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestIdReuse.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestIdReuse.java index 4801a0d244615..43e8479dc9ced 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestIdReuse.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestIdReuse.java @@ -19,16 +19,16 @@ */ package org.neo4j.kernel.impl.core; -import java.io.File; - import org.junit.Rule; import org.junit.Test; +import java.io.File; + import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; -import org.neo4j.test.EphemeralFileSystemRule; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static org.junit.Assert.assertEquals; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestReadOnlyNeo4j.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestReadOnlyNeo4j.java index 6e29e04979778..83550cdcd525e 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestReadOnlyNeo4j.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestReadOnlyNeo4j.java @@ -22,6 +22,8 @@ import org.junit.Rule; import org.junit.Test; +import java.io.File; + import org.neo4j.graphdb.Direction; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Node; @@ -34,19 +36,16 @@ import org.neo4j.kernel.api.exceptions.ReadOnlyDbException; import org.neo4j.kernel.configuration.Settings; import org.neo4j.test.DbRepresentation; -import org.neo4j.test.EphemeralFileSystemRule; import org.neo4j.test.TestGraphDatabaseFactory; - -import java.io.File; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static org.hamcrest.CoreMatchers.instanceOf; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; - import static org.neo4j.graphdb.RelationshipType.withName; -import static org.neo4j.graphdb.Neo4jMatchers.hasProperty; -import static org.neo4j.graphdb.Neo4jMatchers.inTx; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.hasProperty; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.inTx; public class TestReadOnlyNeo4j { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestRelationshipCount.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestRelationshipCount.java index 191b08924ed49..4e7a0cb092e45 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestRelationshipCount.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestRelationshipCount.java @@ -44,8 +44,8 @@ import org.neo4j.helpers.collection.IterableWrapper; import org.neo4j.helpers.collection.Iterables; import org.neo4j.kernel.impl.MyRelTypes; -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.lang.Integer.parseInt; import static java.util.Arrays.asList; @@ -67,7 +67,8 @@ public static Collection data() return data; } - public final @Rule DatabaseRule dbRule; + @Rule + public final DatabaseRule dbRule; private Transaction tx; public TestRelationshipCount( final int denseNodeThreshold ) 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 209067009f5c6..9ad9b48ec4e00 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 @@ -32,18 +32,17 @@ import org.neo4j.kernel.impl.store.AbstractDynamicStore; import org.neo4j.kernel.impl.store.PropertyStore; import org.neo4j.kernel.impl.store.TestShortString; -import org.neo4j.test.DatabaseRule; -import org.neo4j.test.GraphTransactionRule; -import org.neo4j.test.ImpermanentDatabaseRule; +import org.neo4j.test.rule.DatabaseRule; +import org.neo4j.test.rule.GraphTransactionRule; +import org.neo4j.test.rule.ImpermanentDatabaseRule; import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; - import static org.neo4j.graphdb.RelationshipType.withName; -import static org.neo4j.graphdb.Neo4jMatchers.hasProperty; -import static org.neo4j.graphdb.Neo4jMatchers.inTx; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.hasProperty; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.inTx; public class TestShortStringProperties extends TestShortString { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/coreapi/schema/SchemaImplTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/coreapi/schema/SchemaImplTest.java index dfebdcc8d9e63..8a3a789e96bea 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/coreapi/schema/SchemaImplTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/coreapi/schema/SchemaImplTest.java @@ -35,8 +35,8 @@ import org.neo4j.graphdb.schema.IndexDefinition; import org.neo4j.graphdb.schema.Schema; import org.neo4j.helpers.collection.Iterables; -import org.neo4j.test.EphemeralFileSystemRule; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/event/TestTransactionEvents.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/event/TestTransactionEvents.java index 62741e8793fc2..6ec3f359d9dc3 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/event/TestTransactionEvents.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/event/TestTransactionEvents.java @@ -45,9 +45,9 @@ import org.neo4j.graphdb.event.TransactionEventHandler; import org.neo4j.graphdb.schema.IndexDefinition; import org.neo4j.kernel.impl.MyRelTypes; -import org.neo4j.test.DatabaseRule; -import org.neo4j.test.ImpermanentDatabaseRule; import org.neo4j.test.TestLabels; +import org.neo4j.test.rule.DatabaseRule; +import org.neo4j.test.rule.ImpermanentDatabaseRule; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertEquals; @@ -58,16 +58,19 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.neo4j.graphdb.Label.label; -import static org.neo4j.graphdb.Neo4jMatchers.hasProperty; -import static org.neo4j.graphdb.Neo4jMatchers.inTx; import static org.neo4j.graphdb.RelationshipType.withName; import static org.neo4j.graphdb.index.IndexManager.PROVIDER; import static org.neo4j.helpers.collection.Iterables.count; import static org.neo4j.helpers.collection.MapUtil.stringMap; import static org.neo4j.kernel.impl.index.DummyIndexExtensionFactory.IDENTIFIER; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.hasProperty; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.inTx; public class TestTransactionEvents { + @Rule + public final DatabaseRule dbRule = new ImpermanentDatabaseRule(); + @Test public void testRegisterUnregisterHandlers() { @@ -1191,8 +1194,6 @@ public void clear() } } - @Rule - public final DatabaseRule dbRule = new ImpermanentDatabaseRule(); private static class RelationshipData { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/event/TransactionEventsIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/event/TransactionEventsIT.java index a97ef1b96fe54..6948e00ca6597 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/event/TransactionEventsIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/event/TransactionEventsIT.java @@ -33,17 +33,19 @@ import org.neo4j.graphdb.RelationshipType; import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.event.TransactionEventHandler; -import org.neo4j.test.DatabaseRule; -import org.neo4j.test.ImpermanentDatabaseRule; -import org.neo4j.test.RandomRule; +import org.neo4j.test.rule.DatabaseRule; +import org.neo4j.test.rule.ImpermanentDatabaseRule; +import org.neo4j.test.rule.RandomRule; /** * Test for randomly creating data and verifying transaction data seen in transaction event handlers. */ public class TransactionEventsIT { - public final @Rule DatabaseRule db = new ImpermanentDatabaseRule(); - public final @Rule RandomRule random = new RandomRule(); + @Rule + public final DatabaseRule db = new ImpermanentDatabaseRule(); + @Rule + public final RandomRule random = new RandomRule(); @Test public void shouldSeeExpectedTransactionData() throws Exception diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/TestIndexImplOnNeo.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/TestIndexImplOnNeo.java index c7dca6c2b474d..135c7f59bfbd8 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/TestIndexImplOnNeo.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/TestIndexImplOnNeo.java @@ -32,8 +32,8 @@ import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.index.Index; import org.neo4j.helpers.collection.Iterables; -import org.neo4j.test.EphemeralFileSystemRule; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/locking/LockingCompatibilityTestSuite.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/locking/LockingCompatibilityTestSuite.java index c51adf8b18ae2..aebef3cba01a0 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 @@ -30,17 +30,17 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.neo4j.kernel.api.index.ParameterizedSuiteRunner; import org.neo4j.storageengine.api.lock.AcquireLockTimeoutException; import org.neo4j.storageengine.api.lock.ResourceType; import org.neo4j.test.OtherThreadExecutor.WorkerCommand; -import org.neo4j.test.OtherThreadRule; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.concurrent.OtherThreadRule; +import org.neo4j.test.runner.ParameterizedSuiteRunner; import static junit.framework.TestCase.assertFalse; import static junit.framework.TestCase.fail; import static org.hamcrest.MatcherAssert.assertThat; -import static org.neo4j.test.OtherThreadRule.isWaiting; +import static org.neo4j.test.rule.concurrent.OtherThreadRule.isWaiting; /** Base for locking tests. */ @RunWith(ParameterizedSuiteRunner.class) diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/locking/ReentrantLockServiceTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/locking/ReentrantLockServiceTest.java index a09d9baa826f7..ded5400ea494d 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/locking/ReentrantLockServiceTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/locking/ReentrantLockServiceTest.java @@ -19,11 +19,13 @@ */ package org.neo4j.kernel.impl.locking; -import java.util.concurrent.TimeUnit; - import org.junit.Rule; import org.junit.Test; +import java.util.concurrent.TimeUnit; + +import org.neo4j.test.rule.concurrent.ThreadRepository; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/pagecache/ConfiguringPageCacheFactoryTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/pagecache/ConfiguringPageCacheFactoryTest.java index a965d98241c24..4c52d6f15099a 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/pagecache/ConfiguringPageCacheFactoryTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/pagecache/ConfiguringPageCacheFactoryTest.java @@ -19,25 +19,24 @@ */ package org.neo4j.kernel.impl.pagecache; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; + import org.neo4j.graphdb.factory.GraphDatabaseSettings; import org.neo4j.io.pagecache.PageCache; import org.neo4j.io.pagecache.impl.SingleFilePageSwapperFactory; import org.neo4j.io.pagecache.tracing.PageCacheTracer; import org.neo4j.kernel.configuration.Config; import org.neo4j.logging.NullLog; -import org.neo4j.test.EphemeralFileSystemRule; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; - import static org.neo4j.graphdb.factory.GraphDatabaseSettings.mapped_memory_page_size; import static org.neo4j.graphdb.factory.GraphDatabaseSettings.pagecache_memory; import static org.neo4j.graphdb.factory.GraphDatabaseSettings.pagecache_swapper; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/recovery/KernelRecoveryTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/recovery/KernelRecoveryTest.java index 346a5f0a6ad1a..41e2a683bf0af 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/recovery/KernelRecoveryTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/recovery/KernelRecoveryTest.java @@ -32,16 +32,16 @@ import org.neo4j.kernel.impl.transaction.command.Command.NodeCountsCommand; import org.neo4j.kernel.impl.transaction.log.LogPosition; import org.neo4j.kernel.impl.transaction.log.PhysicalLogFile; -import org.neo4j.test.EphemeralFileSystemRule; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static org.hamcrest.MatcherAssert.assertThat; -import static org.neo4j.kernel.impl.transaction.LogMatchers.checkPoint; -import static org.neo4j.kernel.impl.transaction.LogMatchers.commandEntry; -import static org.neo4j.kernel.impl.transaction.LogMatchers.commitEntry; -import static org.neo4j.kernel.impl.transaction.LogMatchers.containsExactly; -import static org.neo4j.kernel.impl.transaction.LogMatchers.logEntries; -import static org.neo4j.kernel.impl.transaction.LogMatchers.startEntry; +import static org.neo4j.test.mockito.matcher.LogMatchers.checkPoint; +import static org.neo4j.test.mockito.matcher.LogMatchers.commandEntry; +import static org.neo4j.test.mockito.matcher.LogMatchers.commitEntry; +import static org.neo4j.test.mockito.matcher.LogMatchers.containsExactly; +import static org.neo4j.test.mockito.matcher.LogMatchers.logEntries; +import static org.neo4j.test.mockito.matcher.LogMatchers.startEntry; public class KernelRecoveryTest { 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 0ca34e542596c..8afb4d4952fe5 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 @@ -31,9 +31,9 @@ import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; -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.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordStorageEngineTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordStorageEngineTest.java index 61d16053c8faf..b48364702575b 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordStorageEngineTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordStorageEngineTest.java @@ -41,8 +41,9 @@ import org.neo4j.kernel.impl.transaction.log.TransactionIdStore; import org.neo4j.kernel.internal.DatabaseHealth; import org.neo4j.storageengine.api.TransactionApplicationMode; -import org.neo4j.test.EphemeralFileSystemRule; -import org.neo4j.test.PageCacheRule; +import org.neo4j.test.rule.PageCacheRule; +import org.neo4j.test.rule.RecordStorageEngineRule; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static org.hamcrest.Matchers.sameInstance; import static org.junit.Assert.assertNotNull; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/CommonAbstractStoreTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/CommonAbstractStoreTest.java index 51b538f718148..6ffa8d4522807 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 @@ -51,8 +51,8 @@ import org.neo4j.kernel.impl.store.record.RecordLoad; import org.neo4j.logging.LogProvider; import org.neo4j.logging.NullLogProvider; -import org.neo4j.test.PageCacheRule; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.PageCacheRule; +import org.neo4j.test.rule.TargetDirectory; import static org.hamcrest.Matchers.instanceOf; import static org.junit.Assert.assertNotNull; @@ -71,7 +71,7 @@ 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.TargetDirectory.testDirForTest; +import static org.neo4j.test.rule.TargetDirectory.testDirForTest; public class CommonAbstractStoreTest { 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 ddc23fbecaff8..7e1fcbdf2ed3f 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,13 +34,11 @@ import org.neo4j.kernel.impl.storemigration.StoreFile; import org.neo4j.kernel.impl.storemigration.StoreFileType; import org.neo4j.logging.NullLogProvider; -import org.neo4j.test.PageCacheRule; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.PageCacheRule; +import org.neo4j.test.rule.TargetDirectory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; - - import static org.neo4j.kernel.impl.store.id.IdGeneratorImpl.HEADER_SIZE; import static org.neo4j.kernel.impl.store.id.IdGeneratorImpl.markAsSticky; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/IdGeneratorImplContractTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/IdGeneratorImplContractTest.java index feec5a83be319..1b8e97b3b5ded 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/IdGeneratorImplContractTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/IdGeneratorImplContractTest.java @@ -19,17 +19,17 @@ */ package org.neo4j.kernel.impl.store; -import java.io.File; - import org.junit.After; import org.junit.Before; import org.junit.Rule; +import java.io.File; + import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction; import org.neo4j.kernel.impl.AbstractNeo4jTestCase; import org.neo4j.kernel.impl.store.id.IdGenerator; import org.neo4j.kernel.impl.store.id.IdGeneratorImpl; -import org.neo4j.test.EphemeralFileSystemRule; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static org.junit.Assert.assertTrue; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/IdGeneratorRebuildFailureEmulationTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/IdGeneratorRebuildFailureEmulationTest.java index 86166bcc92676..fe0786e1bda4a 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/IdGeneratorRebuildFailureEmulationTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/IdGeneratorRebuildFailureEmulationTest.java @@ -40,18 +40,18 @@ import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.factory.GraphDatabaseSettings; import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction; -import org.neo4j.kernel.configuration.Settings; import org.neo4j.io.fs.FileSystemAbstraction; -import org.neo4j.kernel.impl.store.format.lowlimit.LowLimitV3_0; -import org.neo4j.kernel.impl.store.id.DefaultIdGeneratorFactory; import org.neo4j.kernel.configuration.Config; +import org.neo4j.kernel.configuration.Settings; import org.neo4j.kernel.impl.factory.CommunityFacadeFactory; 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.impl.store.format.lowlimit.LowLimitV3_0; +import org.neo4j.kernel.impl.store.id.DefaultIdGeneratorFactory; import org.neo4j.logging.NullLogProvider; import org.neo4j.test.ImpermanentGraphDatabase; -import org.neo4j.test.PageCacheRule; +import org.neo4j.test.rule.PageCacheRule; import static org.hamcrest.Matchers.startsWith; import static org.junit.Assert.assertEquals; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/IdGeneratorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/IdGeneratorTest.java index a044860386a1d..c54e5c0a439c6 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/IdGeneratorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/IdGeneratorTest.java @@ -54,9 +54,9 @@ import org.neo4j.kernel.impl.store.id.IdGenerator; import org.neo4j.kernel.impl.store.id.IdGeneratorImpl; import org.neo4j.kernel.impl.store.record.AbstractBaseRecord; -import org.neo4j.test.EphemeralFileSystemRule; -import org.neo4j.test.PageCacheRule; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.PageCacheRule; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertEquals; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/MetaDataStoreTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/MetaDataStoreTest.java index 48d6946aaafa3..e92db7b5bf3c0 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 @@ -48,8 +48,8 @@ import org.neo4j.kernel.impl.store.record.MetaDataRecord; import org.neo4j.kernel.impl.store.record.RecordLoad; import org.neo4j.logging.NullLogProvider; -import org.neo4j.test.EphemeralFileSystemRule; -import org.neo4j.test.PageCacheRule; +import org.neo4j.test.rule.PageCacheRule; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/NeoStoresIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/NeoStoresIT.java index 3195058769eb9..6349918963cfe 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/NeoStoresIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/NeoStoresIT.java @@ -34,12 +34,13 @@ import org.neo4j.graphdb.factory.GraphDatabaseBuilder; import org.neo4j.graphdb.factory.GraphDatabaseSettings; import org.neo4j.helpers.Exceptions; -import org.neo4j.test.DatabaseRule; -import org.neo4j.test.EmbeddedDatabaseRule; +import org.neo4j.test.rule.DatabaseRule; +import org.neo4j.test.rule.EmbeddedDatabaseRule; public class NeoStoresIT { - public final @Rule DatabaseRule db = new EmbeddedDatabaseRule() + @Rule + public final DatabaseRule db = new EmbeddedDatabaseRule() { @Override protected void configure( GraphDatabaseBuilder builder ) diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/NeoStoresMocking.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/NeoStoresMocking.java deleted file mode 100644 index 778c006d21aa1..0000000000000 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/NeoStoresMocking.java +++ /dev/null @@ -1,44 +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.kernel.impl.store; - -import org.neo4j.kernel.impl.store.record.RelationshipGroupRecord; - -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -public class NeoStoresMocking -{ - public static NeoStores mockNeoStores() - { - NeoStores mockStore = mock( NeoStores.class ); - MetaDataStore metaDataStore = mock( MetaDataStore.class ); - when( mockStore.getMetaDataStore() ).thenReturn( metaDataStore ); - PropertyStore propertyStore = mock( PropertyStore.class ); - when( mockStore.getPropertyStore() ).thenReturn( propertyStore ); - DynamicStringStore stringStore = mock( DynamicStringStore.class ); - when( propertyStore.getStringStore() ).thenReturn( stringStore ); - DynamicArrayStore arrayStore = mock( DynamicArrayStore.class ); - when( propertyStore.getArrayStore() ).thenReturn( arrayStore ); - RecordStore relationshipGroupStore = mock( RelationshipGroupStore.class ); - when( mockStore.getRelationshipGroupStore() ).thenReturn( relationshipGroupStore ); - return mockStore; - } -} 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 6725ff0cd3249..da7819d3f3608 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 @@ -81,11 +81,11 @@ import org.neo4j.storageengine.api.StoreReadLayer; import org.neo4j.storageengine.api.Token; import org.neo4j.string.UTF8; -import org.neo4j.test.EphemeralFileSystemRule; -import org.neo4j.test.NeoStoreDataSourceRule; -import org.neo4j.test.PageCacheRule; -import org.neo4j.test.TargetDirectory; 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.filesystem.EphemeralFileSystemRule; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/NodeStoreTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/NodeStoreTest.java index 31dfc165364b7..84731d4ab67f6 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/NodeStoreTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/NodeStoreTest.java @@ -52,8 +52,8 @@ import org.neo4j.kernel.impl.store.record.DynamicRecord; import org.neo4j.kernel.impl.store.record.NodeRecord; import org.neo4j.logging.NullLogProvider; -import org.neo4j.test.EphemeralFileSystemRule; -import org.neo4j.test.PageCacheRule; +import org.neo4j.test.rule.PageCacheRule; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static java.util.Arrays.asList; import static org.junit.Assert.assertEquals; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/PropertyKeyTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/PropertyKeyTest.java index 1c414132d3545..a3cb7ce157a0c 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/PropertyKeyTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/PropertyKeyTest.java @@ -31,8 +31,8 @@ import org.neo4j.graphdb.Transaction; import org.neo4j.helpers.collection.Iterables; import org.neo4j.io.fs.FileSystemAbstraction; -import org.neo4j.test.EphemeralFileSystemRule; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import org.neo4j.unsafe.batchinsert.BatchInserter; import org.neo4j.unsafe.batchinsert.BatchInserters; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/PropertyStoreTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/PropertyStoreTest.java index acae983b11eb9..b241f5d0b40fa 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/PropertyStoreTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/PropertyStoreTest.java @@ -40,8 +40,8 @@ import org.neo4j.kernel.impl.store.record.PropertyKeyTokenRecord; import org.neo4j.kernel.impl.store.record.PropertyRecord; import org.neo4j.logging.NullLogProvider; -import org.neo4j.test.EphemeralFileSystemRule; -import org.neo4j.test.PageCacheRule; +import org.neo4j.test.rule.PageCacheRule; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static java.util.Collections.singletonMap; import static org.junit.Assert.assertFalse; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/RecordSizesDocTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/RecordSizesDocTest.java index db094c31b611a..abdc0d2d5cd7c 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 @@ -27,21 +27,21 @@ import org.neo4j.kernel.impl.store.format.lowlimit.NodeRecordFormat; import org.neo4j.kernel.impl.store.format.lowlimit.PropertyRecordFormat; import org.neo4j.kernel.impl.store.format.lowlimit.RelationshipRecordFormat; -import org.neo4j.test.docs.DocsIncludeFile; +import org.neo4j.test.rule.docs.DocsIncludeFile; import static java.util.Arrays.asList; - +import static org.neo4j.kernel.impl.store.StoreFactory.Configuration.array_block_size; +import static org.neo4j.kernel.impl.store.StoreFactory.Configuration.string_block_size; import static org.neo4j.kernel.impl.store.StoreFactory.NODE_STORE_NAME; import static org.neo4j.kernel.impl.store.StoreFactory.PROPERTY_ARRAYS_STORE_NAME; import static org.neo4j.kernel.impl.store.StoreFactory.PROPERTY_STORE_NAME; import static org.neo4j.kernel.impl.store.StoreFactory.PROPERTY_STRINGS_STORE_NAME; import static org.neo4j.kernel.impl.store.StoreFactory.RELATIONSHIP_STORE_NAME; -import static org.neo4j.kernel.impl.store.StoreFactory.Configuration.array_block_size; -import static org.neo4j.kernel.impl.store.StoreFactory.Configuration.string_block_size; public class RecordSizesDocTest { - public final @Rule DocsIncludeFile writer = DocsIncludeFile.inSection( "ops" ); + @Rule + public final DocsIncludeFile writer = DocsIncludeFile.inSection( "ops" ); @Test public void record_sizes_table() throws Exception diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/RecordStoreConsistentReadTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/RecordStoreConsistentReadTest.java index a70f7d2a8e045..5c095b3d584b2 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/RecordStoreConsistentReadTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/RecordStoreConsistentReadTest.java @@ -44,7 +44,7 @@ import org.neo4j.kernel.impl.store.record.RelationshipRecord; import org.neo4j.logging.NullLogProvider; import org.neo4j.string.UTF8; -import org.neo4j.test.PageCacheRule; +import org.neo4j.test.rule.PageCacheRule; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertNotNull; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/RecordStoreUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/RecordStoreUtil.java index 734eccc97d816..eca65e05fc144 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/RecordStoreUtil.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/RecordStoreUtil.java @@ -57,13 +57,4 @@ public NodeRecord answer( InvocationOnMock invocation ) throws Throwable return record; } } - - public static class NewNodeRecordAnswer implements Answer - { - @Override - public NodeRecord answer( InvocationOnMock invocation ) throws Throwable - { - return new NodeRecord( -1 ); - } - } } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/RelationshipChainPointerChasingTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/RelationshipChainPointerChasingTest.java index 9ea7ed412eafe..15a19974fd105 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/RelationshipChainPointerChasingTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/RelationshipChainPointerChasingTest.java @@ -30,8 +30,8 @@ import org.neo4j.graphdb.factory.GraphDatabaseBuilder; import org.neo4j.graphdb.factory.GraphDatabaseSettings; import org.neo4j.kernel.impl.MyRelTypes; -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.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; 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 fbbada7f36ddb..289f876397e02 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 @@ -19,6 +19,11 @@ */ package org.neo4j.kernel.impl.store; +import org.junit.After; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; + import java.io.File; import java.util.HashMap; import java.util.HashSet; @@ -26,11 +31,6 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; - import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Relationship; import org.neo4j.graphdb.Transaction; @@ -50,17 +50,15 @@ import org.neo4j.kernel.impl.store.record.RelationshipRecord; import org.neo4j.logging.NullLogProvider; import org.neo4j.test.ImpermanentGraphDatabase; -import org.neo4j.test.PageCacheRule; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.PageCacheRule; +import org.neo4j.test.rule.TargetDirectory; import static java.lang.Integer.parseInt; import static java.util.Arrays.asList; - import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertThat; - import static org.neo4j.kernel.impl.store.RecordStore.getRecord; import static org.neo4j.kernel.impl.store.record.RecordLoad.NORMAL; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/SchemaStorageTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/SchemaStorageTest.java index f14a5a62968c5..1f0160d885cf0 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/SchemaStorageTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/SchemaStorageTest.java @@ -19,16 +19,16 @@ */ package org.neo4j.kernel.impl.store; -import java.util.HashSet; -import java.util.Set; -import java.util.concurrent.TimeUnit; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.mockito.Mockito; +import java.util.HashSet; +import java.util.Set; +import java.util.concurrent.TimeUnit; + import org.neo4j.function.Predicates; import org.neo4j.graphdb.DependencyResolver; import org.neo4j.graphdb.Transaction; @@ -48,8 +48,8 @@ import org.neo4j.kernel.impl.store.record.RelationshipPropertyExistenceConstraintRule; import org.neo4j.kernel.impl.store.record.UniquePropertyConstraintRule; import org.neo4j.storageengine.api.schema.SchemaRule; -import org.neo4j.test.EmbeddedDatabaseRule; -import org.neo4j.test.KernelExceptionUserMessageMatcher; +import org.neo4j.test.mockito.matcher.KernelExceptionUserMessageMatcher; +import org.neo4j.test.rule.EmbeddedDatabaseRule; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/SchemaStoreTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/SchemaStoreTest.java index 9a9a78e3375f3..1de2554b2575c 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/SchemaStoreTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/SchemaStoreTest.java @@ -39,8 +39,8 @@ import org.neo4j.kernel.impl.store.record.RecordSerializer; import org.neo4j.logging.NullLogProvider; import org.neo4j.storageengine.api.schema.SchemaRule; -import org.neo4j.test.EphemeralFileSystemRule; -import org.neo4j.test.PageCacheRule; +import org.neo4j.test.rule.PageCacheRule; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static java.nio.ByteBuffer.wrap; import static org.junit.Assert.assertEquals; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/StoreFactoryTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/StoreFactoryTest.java index ee2bab230fd91..185b17efef050 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/StoreFactoryTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/StoreFactoryTest.java @@ -29,16 +29,16 @@ import org.neo4j.graphdb.factory.GraphDatabaseSettings; import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction; -import org.neo4j.kernel.configuration.Settings; import org.neo4j.helpers.collection.MapUtil; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; +import org.neo4j.kernel.configuration.Config; +import org.neo4j.kernel.configuration.Settings; import org.neo4j.kernel.impl.store.format.lowlimit.LowLimitV3_0; import org.neo4j.kernel.impl.store.id.DefaultIdGeneratorFactory; -import org.neo4j.kernel.configuration.Config; import org.neo4j.logging.NullLogProvider; -import org.neo4j.test.PageCacheRule; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.PageCacheRule; +import org.neo4j.test.rule.TargetDirectory; import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.assertEquals; 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 5658f2f303194..2ec53c91e625f 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 @@ -43,8 +43,8 @@ import org.neo4j.kernel.impl.util.Bits; import org.neo4j.logging.NullLogProvider; import org.neo4j.string.UTF8; -import org.neo4j.test.PageCacheRule; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.PageCacheRule; +import org.neo4j.test.rule.TargetDirectory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; 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 85156f2691935..5e721ac17fae1 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 @@ -29,8 +29,8 @@ import java.util.concurrent.Future; import org.neo4j.kernel.impl.transaction.log.PhysicalLogFile; -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.neo4j.test.ProcessTestUtil.startSubProcess; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestDynamicStore.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestDynamicStore.java index ec0b8b177381e..3f399eafa001e 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestDynamicStore.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestDynamicStore.java @@ -19,6 +19,11 @@ */ package org.neo4j.kernel.impl.store; +import org.junit.After; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; + import java.io.File; import java.util.ArrayList; import java.util.Collection; @@ -28,11 +33,6 @@ import java.util.Random; import java.util.Set; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; - import org.neo4j.graphdb.config.InvalidSettingException; import org.neo4j.graphdb.config.Setting; import org.neo4j.graphdb.factory.GraphDatabaseSettings; @@ -44,8 +44,8 @@ import org.neo4j.kernel.impl.store.id.DefaultIdGeneratorFactory; import org.neo4j.kernel.impl.store.record.DynamicRecord; import org.neo4j.logging.NullLogProvider; -import org.neo4j.test.EphemeralFileSystemRule; -import org.neo4j.test.PageCacheRule; +import org.neo4j.test.rule.PageCacheRule; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static java.util.Collections.singletonMap; import static org.junit.Assert.assertEquals; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestGraphProperties.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestGraphProperties.java index e2a7c93785e0e..9d7a453757070 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 @@ -34,16 +34,16 @@ import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.factory.GraphDatabaseSettings; import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction; +import org.neo4j.kernel.configuration.Config; +import org.neo4j.kernel.impl.core.NodeManager; import org.neo4j.kernel.impl.store.format.lowlimit.LowLimitV3_0; import org.neo4j.kernel.impl.store.id.DefaultIdGeneratorFactory; import org.neo4j.kernel.internal.GraphDatabaseAPI; -import org.neo4j.kernel.configuration.Config; -import org.neo4j.kernel.impl.core.NodeManager; import org.neo4j.logging.NullLogProvider; -import org.neo4j.test.EphemeralFileSystemRule; import org.neo4j.test.OtherThreadExecutor; -import org.neo4j.test.PageCacheRule; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.PageCacheRule; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertArrayEquals; @@ -52,10 +52,10 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -import static org.neo4j.graphdb.Neo4jMatchers.containsOnly; -import static org.neo4j.graphdb.Neo4jMatchers.getPropertyKeys; -import static org.neo4j.graphdb.Neo4jMatchers.hasProperty; -import static org.neo4j.graphdb.Neo4jMatchers.inTx; +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; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.inTx; public class TestGraphProperties { 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 4aac7d8218e95..24cdacdbb7415 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 @@ -25,25 +25,23 @@ import java.io.File; -import org.neo4j.io.pagecache.PageCache; import org.neo4j.io.fs.DefaultFileSystemAbstraction; +import org.neo4j.io.pagecache.PageCache; +import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.store.format.lowlimit.LowLimitV3_0; import org.neo4j.kernel.impl.store.format.lowlimit.NodeRecordFormat; import org.neo4j.kernel.impl.store.id.DefaultIdGeneratorFactory; -import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.store.record.NodeRecord; import org.neo4j.logging.NullLogProvider; -import org.neo4j.test.PageCacheRule; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.PageCacheRule; +import org.neo4j.test.rule.TargetDirectory; 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; public class TestGrowingFileMemoryMapping diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestIdGeneratorRebuilding.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestIdGeneratorRebuilding.java index 836bdfb39bdf2..b5b49b7f355a8 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestIdGeneratorRebuilding.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestIdGeneratorRebuilding.java @@ -40,8 +40,8 @@ import org.neo4j.kernel.impl.store.record.DynamicRecord; import org.neo4j.kernel.impl.store.record.NodeRecord; import org.neo4j.logging.NullLogProvider; -import org.neo4j.test.EphemeralFileSystemRule; -import org.neo4j.test.PageCacheRule; +import org.neo4j.test.rule.PageCacheRule; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.is; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestStoreAccess.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestStoreAccess.java index 70791c66c209b..00d7308d6c509 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestStoreAccess.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestStoreAccess.java @@ -31,9 +31,9 @@ import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; import org.neo4j.kernel.impl.recovery.RecoveryRequiredChecker; -import org.neo4j.test.EphemeralFileSystemRule; -import org.neo4j.test.PageCacheRule; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.PageCacheRule; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static org.junit.Assert.assertTrue; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/UpgradeStoreIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/UpgradeStoreIT.java index a2b555ce0239c..5e7fb2ba45082 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/UpgradeStoreIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/UpgradeStoreIT.java @@ -56,8 +56,8 @@ import org.neo4j.kernel.impl.transaction.log.PhysicalLogFile; import org.neo4j.logging.NullLogProvider; import org.neo4j.string.UTF8; -import org.neo4j.test.PageCacheRule; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.PageCacheRule; import org.neo4j.unsafe.batchinsert.BatchInserters; import static org.junit.Assert.assertFalse; 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 e582bbe47fcd5..6e02d8cba12a8 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 @@ -19,14 +19,14 @@ */ package org.neo4j.kernel.impl.store.countStore; -import java.io.File; -import java.io.IOException; -import java.util.Map; - import org.junit.Assert; import org.junit.Rule; import org.junit.Test; +import java.io.File; +import java.io.IOException; +import java.util.Map; + import org.neo4j.io.fs.DefaultFileSystemAbstraction; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.fs.StoreChannel; @@ -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.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static org.neo4j.kernel.impl.store.countStore.CountsSnapshotDeserializer.deserialize; import static org.neo4j.kernel.impl.store.countStore.CountsSnapshotSerializer.serialize; 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 f008bd157a4a5..7b66d9c86dfca 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 @@ -50,10 +50,10 @@ import org.neo4j.logging.NullLogProvider; import org.neo4j.register.Register; import org.neo4j.register.Registers; -import org.neo4j.test.EphemeralFileSystemRule; -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 org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static org.junit.Assert.assertEquals; import static org.neo4j.kernel.impl.store.counts.keys.CountsKeyFactory.nodeKey; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/counts/CountsRotationTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/counts/CountsRotationTest.java index 5fb0781bfb5dc..eb744bb87cf1f 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 @@ -19,6 +19,10 @@ */ package org.neo4j.kernel.impl.store.counts; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; + import java.io.File; import java.io.IOException; import java.util.ArrayList; @@ -29,10 +33,6 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; - import org.neo4j.adversaries.ClassGuardedAdversary; import org.neo4j.adversaries.CountingAdversary; import org.neo4j.graphdb.GraphDatabaseService; @@ -44,7 +44,6 @@ import org.neo4j.helpers.collection.Pair; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; -import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.CountsVisitor; import org.neo4j.kernel.impl.core.LabelTokenHolder; @@ -57,13 +56,14 @@ 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.checkpoint.TriggerInfo; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.lifecycle.Lifespan; import org.neo4j.logging.NullLogProvider; import org.neo4j.test.AdversarialPageCacheGraphDatabaseFactory; -import org.neo4j.test.EphemeralFileSystemRule; -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 org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static org.hamcrest.Matchers.instanceOf; import static org.junit.Assert.assertEquals; @@ -71,7 +71,6 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; - import static org.neo4j.kernel.impl.store.counts.FileVersion.INITIAL_MINOR_VERSION; import static org.neo4j.kernel.impl.transaction.log.TransactionIdStore.BASE_TX_ID; import static org.neo4j.register.Registers.newDoubleLongRegister; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/counts/CountsTrackerTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/counts/CountsTrackerTest.java index 9d5e0869ab648..2a2cdae9c2ff2 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/counts/CountsTrackerTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/counts/CountsTrackerTest.java @@ -35,11 +35,11 @@ import org.neo4j.kernel.impl.store.counts.keys.CountsKey; import org.neo4j.kernel.impl.store.kvstore.DataInitializer; import org.neo4j.kernel.impl.store.kvstore.ReadableBuffer; -import org.neo4j.kernel.impl.store.kvstore.Resources; import org.neo4j.kernel.lifecycle.Lifespan; import org.neo4j.register.Registers; import org.neo4j.test.Barrier; -import org.neo4j.test.ThreadingRule; +import org.neo4j.test.rule.Resources; +import org.neo4j.test.rule.concurrent.ThreadingRule; import static java.util.concurrent.TimeUnit.SECONDS; import static org.junit.Assert.assertEquals; @@ -49,8 +49,8 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.neo4j.kernel.impl.store.kvstore.Resources.InitialLifecycle.STARTED; -import static org.neo4j.kernel.impl.store.kvstore.Resources.TestPath.FILE_IN_EXISTING_DIRECTORY; +import static org.neo4j.test.rule.Resources.InitialLifecycle.STARTED; +import static org.neo4j.test.rule.Resources.TestPath.FILE_IN_EXISTING_DIRECTORY; public class CountsTrackerTest { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/format/LimitedRecordGenerators.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/format/LimitedRecordGenerators.java index 7f4ccc901049b..fe00edb652a8e 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/format/LimitedRecordGenerators.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/format/LimitedRecordGenerators.java @@ -30,7 +30,7 @@ import org.neo4j.kernel.impl.store.record.RelationshipGroupRecord; import org.neo4j.kernel.impl.store.record.RelationshipRecord; import org.neo4j.kernel.impl.store.record.RelationshipTypeTokenRecord; -import org.neo4j.test.RandomRule; +import org.neo4j.test.rule.RandomRule; import static java.lang.Math.abs; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/format/RecordFormatTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/format/RecordFormatTest.java index 565de0f07af71..5f72411fbcb92 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/format/RecordFormatTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/format/RecordFormatTest.java @@ -37,9 +37,9 @@ import org.neo4j.kernel.impl.store.format.RecordGenerators.Generator; import org.neo4j.kernel.impl.store.record.AbstractBaseRecord; import org.neo4j.kernel.impl.store.record.Record; -import org.neo4j.test.EphemeralFileSystemRule; -import org.neo4j.test.PageCacheRule; -import org.neo4j.test.RandomRule; +import org.neo4j.test.rule.PageCacheRule; +import org.neo4j.test.rule.RandomRule; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import org.neo4j.unsafe.impl.batchimport.store.BatchingIdSequence; import static java.lang.System.currentTimeMillis; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/id/IdGeneratorImplTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/id/IdGeneratorImplTest.java index 71096e4b4f3bb..87b6f0eabc889 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/id/IdGeneratorImplTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/id/IdGeneratorImplTest.java @@ -29,7 +29,7 @@ import org.neo4j.kernel.impl.store.InvalidIdGeneratorException; import org.neo4j.kernel.impl.store.id.validation.IdCapacityExceededException; import org.neo4j.kernel.impl.store.id.validation.NegativeIdException; -import org.neo4j.test.EphemeralFileSystemRule; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static java.util.concurrent.TimeUnit.MINUTES; import static org.hamcrest.Matchers.equalTo; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/kvstore/AbstractKeyValueStoreTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/kvstore/AbstractKeyValueStoreTest.java index 3653d2cd49fd7..3c4ba7567098e 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/kvstore/AbstractKeyValueStoreTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/kvstore/AbstractKeyValueStoreTest.java @@ -39,15 +39,16 @@ import org.neo4j.io.fs.StoreChannel; import org.neo4j.kernel.impl.transaction.log.TransactionIdStore; import org.neo4j.kernel.lifecycle.Lifespan; -import org.neo4j.test.ThreadingRule; +import org.neo4j.test.rule.Resources; +import org.neo4j.test.rule.concurrent.ThreadingRule; import static java.util.concurrent.TimeUnit.SECONDS; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.neo4j.kernel.impl.store.kvstore.DataProvider.EMPTY_DATA_PROVIDER; -import static org.neo4j.kernel.impl.store.kvstore.Resources.InitialLifecycle.STARTED; -import static org.neo4j.kernel.impl.store.kvstore.Resources.TestPath.FILE_IN_EXISTING_DIRECTORY; +import static org.neo4j.test.rule.Resources.InitialLifecycle.STARTED; +import static org.neo4j.test.rule.Resources.TestPath.FILE_IN_EXISTING_DIRECTORY; public class AbstractKeyValueStoreTest { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/kvstore/KeyValueStoreFileFormatTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/kvstore/KeyValueStoreFileFormatTest.java index 2d64a0e677c50..b7574a37cb449 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/kvstore/KeyValueStoreFileFormatTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/kvstore/KeyValueStoreFileFormatTest.java @@ -37,9 +37,9 @@ import org.neo4j.helpers.collection.Pair; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.kernel.configuration.Config; -import org.neo4j.test.EphemeralFileSystemRule; -import org.neo4j.test.PageCacheRule; -import org.neo4j.test.ResourceRule; +import org.neo4j.test.rule.PageCacheRule; +import org.neo4j.test.rule.ResourceRule; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -47,7 +47,7 @@ import static org.junit.Assert.fail; import static org.neo4j.kernel.impl.store.kvstore.KeyValueStoreFileFormatTest.Data.data; import static org.neo4j.kernel.impl.store.kvstore.KeyValueStoreFileFormatTest.DataEntry.entry; -import static org.neo4j.test.ResourceRule.testPath; +import static org.neo4j.test.rule.ResourceRule.testPath; public class KeyValueStoreFileFormatTest { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/StoreVersionCheckTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/StoreVersionCheckTest.java index 985ae13a1d8e3..c7b25c34b4f6a 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/StoreVersionCheckTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/StoreVersionCheckTest.java @@ -30,8 +30,8 @@ import org.neo4j.io.pagecache.PageCache; import org.neo4j.kernel.impl.store.MetaDataStore; import org.neo4j.string.UTF8; -import org.neo4j.test.EphemeralFileSystemRule; -import org.neo4j.test.PageCacheRule; +import org.neo4j.test.rule.PageCacheRule; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/UpgradableDatabaseTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/UpgradableDatabaseTest.java index f5137b4d94480..78b7f5e88765f 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 @@ -44,8 +44,8 @@ import org.neo4j.kernel.impl.store.format.lowlimit.LowLimitV3_0; import org.neo4j.kernel.impl.storemigration.legacystore.LegacyStoreVersionCheck; import org.neo4j.string.UTF8; -import org.neo4j.test.PageCacheRule; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.PageCacheRule; +import org.neo4j.test.rule.TargetDirectory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/LegacyStoreVersionCheckTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/LegacyStoreVersionCheckTest.java index 8301938854c8d..3779c04a0c7ae 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/LegacyStoreVersionCheckTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/LegacyStoreVersionCheckTest.java @@ -27,7 +27,7 @@ import java.io.OutputStream; import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction; -import org.neo4j.test.EphemeralFileSystemRule; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/DeferredIndexedConflictResolutionTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/DeferredIndexedConflictResolutionTest.java index fd9166cb62213..98033886ab5e1 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 @@ -35,15 +35,15 @@ import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.factory.GraphDatabaseFactory; -import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageEngine; import org.neo4j.kernel.impl.store.NeoStores; import org.neo4j.kernel.impl.store.NodeStore; import org.neo4j.kernel.impl.store.PropertyStore; import org.neo4j.kernel.impl.store.RecordStore; import org.neo4j.kernel.impl.store.record.NodeRecord; -import org.neo4j.test.TargetDirectory; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.TargetDirectory; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.is; 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 11b031dc146ff..4ceda3f25d60a 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 @@ -47,8 +47,8 @@ import org.neo4j.kernel.impl.store.record.PropertyRecord; import org.neo4j.kernel.impl.store.record.Record; import org.neo4j.kernel.internal.GraphDatabaseAPI; -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; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/IndexConsultedPropertyBlockSweeperTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/IndexConsultedPropertyBlockSweeperTest.java index 9c786f6ee6c36..823782f25fbaf 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/IndexConsultedPropertyBlockSweeperTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/IndexConsultedPropertyBlockSweeperTest.java @@ -30,7 +30,6 @@ import org.neo4j.graphdb.Label; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; -import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageEngine; import org.neo4j.kernel.impl.store.NeoStores; import org.neo4j.kernel.impl.store.NodeStore; @@ -39,7 +38,8 @@ import org.neo4j.kernel.impl.store.record.NodeRecord; import org.neo4j.kernel.impl.store.record.PropertyBlock; import org.neo4j.kernel.impl.store.record.PropertyRecord; -import org.neo4j.test.EmbeddedDatabaseRule; +import org.neo4j.kernel.internal.GraphDatabaseAPI; +import org.neo4j.test.rule.EmbeddedDatabaseRule; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -47,7 +47,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; - import static org.neo4j.kernel.impl.store.RecordStore.getRecord; public class IndexConsultedPropertyBlockSweeperTest diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/IndexLookupTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/IndexLookupTest.java index 1f294929d9fa5..b10664f62052d 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/IndexLookupTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/IndexLookupTest.java @@ -29,21 +29,22 @@ import org.neo4j.graphdb.Label; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; -import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.api.index.SchemaIndexProvider; import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageEngine; import org.neo4j.kernel.impl.store.LabelTokenStore; import org.neo4j.kernel.impl.store.NeoStores; import org.neo4j.kernel.impl.store.PropertyKeyTokenStore; import org.neo4j.kernel.impl.store.SchemaStore; -import org.neo4j.test.EmbeddedDatabaseRule; +import org.neo4j.kernel.internal.GraphDatabaseAPI; +import org.neo4j.test.rule.EmbeddedDatabaseRule; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -import static org.neo4j.kernel.impl.storemigration.legacystore.v21.propertydeduplication.PropertyDeduplicatorTestUtil.findTokenFor; +import static org.neo4j.kernel.impl.storemigration.legacystore.v21.propertydeduplication.PropertyDeduplicatorTestUtil + .findTokenFor; public class IndexLookupTest { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/NonIndexedConflictResolverTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/NonIndexedConflictResolverTest.java index ed3ab432efa90..c0c9e633d3141 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/NonIndexedConflictResolverTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/NonIndexedConflictResolverTest.java @@ -32,7 +32,6 @@ import org.neo4j.graphdb.DependencyResolver; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; -import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageEngine; import org.neo4j.kernel.impl.store.NeoStores; import org.neo4j.kernel.impl.store.NodeStore; @@ -42,17 +41,19 @@ import org.neo4j.kernel.impl.store.record.PropertyBlock; import org.neo4j.kernel.impl.store.record.PropertyRecord; import org.neo4j.kernel.impl.store.record.Record; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.storageengine.api.Token; -import org.neo4j.test.EmbeddedDatabaseRule; +import org.neo4j.test.rule.EmbeddedDatabaseRule; import static org.hamcrest.Matchers.contains; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; - import static org.neo4j.kernel.impl.store.record.RecordLoad.FORCE; -import static org.neo4j.kernel.impl.storemigration.legacystore.v21.propertydeduplication.PropertyDeduplicatorTestUtil.findTokenFor; -import static org.neo4j.kernel.impl.storemigration.legacystore.v21.propertydeduplication.PropertyDeduplicatorTestUtil.replacePropertyKey; +import static org.neo4j.kernel.impl.storemigration.legacystore.v21.propertydeduplication.PropertyDeduplicatorTestUtil + .findTokenFor; +import static org.neo4j.kernel.impl.storemigration.legacystore.v21.propertydeduplication.PropertyDeduplicatorTestUtil + .replacePropertyKey; public class NonIndexedConflictResolverTest { 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 61cdf77102ef2..163cd7805c852 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 @@ -50,9 +50,9 @@ import org.neo4j.kernel.impl.storemigration.legacystore.LegacyStoreVersionCheck; import org.neo4j.kernel.impl.storemigration.monitoring.SilentMigrationProgressMonitor; import org.neo4j.kernel.impl.transaction.log.LogPosition; -import org.neo4j.test.PageCacheRule; -import org.neo4j.test.TargetDirectory; -import org.neo4j.test.TargetDirectory.TestDirectory; +import org.neo4j.test.rule.PageCacheRule; +import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory.TestDirectory; import static org.junit.Assert.assertEquals; import static org.neo4j.kernel.impl.storemigration.participant.StoreMigrator.readLastTxLogPosition; 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 4065dbc2b480f..214b1b097ad99 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 @@ -37,7 +37,7 @@ import org.neo4j.kernel.impl.factory.CommunityFacadeFactory; import org.neo4j.kernel.impl.factory.GraphDatabaseFacade; import org.neo4j.kernel.impl.factory.PlatformModule; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static java.util.concurrent.TimeUnit.SECONDS; import static org.neo4j.helpers.collection.MapUtil.stringMap; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/ManualAcquireLockTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/ManualAcquireLockTest.java index aba757505c350..ee033d9d60881 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/ManualAcquireLockTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/ManualAcquireLockTest.java @@ -19,8 +19,6 @@ */ package org.neo4j.kernel.impl.transaction; -import java.util.concurrent.ExecutionException; - import org.junit.After; import org.junit.Before; import org.junit.Rule; @@ -28,17 +26,18 @@ import org.junit.rules.RuleChain; import org.junit.rules.TestRule; +import java.util.concurrent.ExecutionException; + import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Lock; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; -import org.neo4j.test.DatabaseRule; -import org.neo4j.test.GraphTransactionRule; -import org.neo4j.test.ImpermanentDatabaseRule; import org.neo4j.test.OtherThreadExecutor; +import org.neo4j.test.rule.DatabaseRule; +import org.neo4j.test.rule.GraphTransactionRule; +import org.neo4j.test.rule.ImpermanentDatabaseRule; import static java.util.concurrent.TimeUnit.MILLISECONDS; - import static org.junit.Assert.fail; public class ManualAcquireLockTest 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 7bf3c930f7bd5..a03fdeebf3820 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 @@ -38,7 +38,6 @@ import org.neo4j.graphdb.factory.GraphDatabaseFactoryState; import org.neo4j.graphdb.factory.GraphDatabaseSettings; import org.neo4j.io.fs.FileSystemAbstraction; -import org.neo4j.kernel.internal.EmbeddedGraphDatabase; import org.neo4j.kernel.impl.api.index.inmemory.InMemoryIndexProviderFactory; import org.neo4j.kernel.impl.api.scan.InMemoryLabelScanStoreExtension; import org.neo4j.kernel.impl.factory.CommunityFacadeFactory; @@ -49,7 +48,8 @@ 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.TargetDirectory; +import org.neo4j.kernel.internal.EmbeddedGraphDatabase; +import org.neo4j.test.rule.TargetDirectory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/ReadAheadLogChannelTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/ReadAheadLogChannelTest.java index ad31d36b6c297..389f01bc569dc 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 @@ -19,26 +19,25 @@ */ package org.neo4j.kernel.impl.transaction; +import org.junit.Rule; +import org.junit.Test; + import java.io.File; import java.io.IOException; import java.nio.ByteBuffer; -import org.junit.Rule; -import org.junit.Test; - import org.neo4j.helpers.collection.Visitor; +import org.neo4j.io.fs.DefaultFileSystemAbstraction; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.fs.StoreChannel; -import org.neo4j.io.fs.DefaultFileSystemAbstraction; import org.neo4j.kernel.impl.transaction.log.LogVersionBridge; 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.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; - import static org.neo4j.kernel.impl.transaction.log.LogVersionBridge.NO_MORE_CHANNELS; public class ReadAheadLogChannelTest diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/ReadTransactionLogWritingTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/ReadTransactionLogWritingTest.java index 19189b2e2272a..a347b826ec60d 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/ReadTransactionLogWritingTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/ReadTransactionLogWritingTest.java @@ -37,9 +37,9 @@ import org.neo4j.kernel.impl.transaction.log.LogFileInformation; import org.neo4j.kernel.impl.transaction.log.entry.LogEntry; import org.neo4j.kernel.internal.GraphDatabaseAPI; -import org.neo4j.test.DatabaseRule; -import org.neo4j.test.ImpermanentDatabaseRule; import org.neo4j.test.LogTestUtils.CountingLogHook; +import org.neo4j.test.rule.DatabaseRule; +import org.neo4j.test.rule.ImpermanentDatabaseRule; import static org.junit.Assert.assertEquals; import static org.neo4j.graphdb.Label.label; @@ -50,23 +50,8 @@ */ public class ReadTransactionLogWritingTest { - @Test - public void shouldNotWriteAnyLogCommandInPureReadTransaction() throws Exception - { - // WHEN - executeTransaction( getRelationships() ); - executeTransaction( getProperties() ); - executeTransaction( getById() ); - executeTransaction( getNodesFromRelationship() ); - - // THEN - long actualCount = countLogEntries(); - assertEquals( "There were " + (actualCount-logEntriesWrittenBeforeReadOperations) + - " log entries written during one or more pure read transactions", - logEntriesWrittenBeforeReadOperations, actualCount ); - } - - public final @Rule DatabaseRule dbr = new ImpermanentDatabaseRule(); + @Rule + public final DatabaseRule dbr = new ImpermanentDatabaseRule(); private final Label label = label( "Test" ); private Node node; @@ -90,6 +75,23 @@ public void createDataset() throws IOException logEntriesWrittenBeforeReadOperations = countLogEntries(); } + @Test + public void shouldNotWriteAnyLogCommandInPureReadTransaction() throws Exception + { + // WHEN + executeTransaction( getRelationships() ); + executeTransaction( getProperties() ); + executeTransaction( getById() ); + executeTransaction( getNodesFromRelationship() ); + + // THEN + long actualCount = countLogEntries(); + assertEquals( "There were " + (actualCount-logEntriesWrittenBeforeReadOperations) + + " log entries written during one or more pure read transactions", + logEntriesWrittenBeforeReadOperations, actualCount ); + } + + private long countLogEntries() { GraphDatabaseAPI db = dbr.getGraphDatabaseAPI(); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/SynchronizedArrayIdOrderingQueueTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/SynchronizedArrayIdOrderingQueueTest.java index 41b4d1ec696d1..1ffbc9e80f5a0 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/SynchronizedArrayIdOrderingQueueTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/SynchronizedArrayIdOrderingQueueTest.java @@ -19,22 +19,25 @@ */ package org.neo4j.kernel.impl.transaction; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import java.util.concurrent.Future; - import org.junit.Rule; import org.junit.Test; +import java.util.concurrent.Future; + import org.neo4j.kernel.impl.util.IdOrderingQueue; import org.neo4j.kernel.impl.util.SynchronizedArrayIdOrderingQueue; -import org.neo4j.test.CleanupRule; import org.neo4j.test.OtherThreadExecutor; import org.neo4j.test.OtherThreadExecutor.WorkerCommand; +import org.neo4j.test.rule.CleanupRule; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; public class SynchronizedArrayIdOrderingQueueTest { + @Rule + public final CleanupRule cleanup = new CleanupRule(); + @Test public void shouldOfferQueueABunchOfIds() throws Exception { @@ -143,6 +146,4 @@ public Object doWork( Void state ) throws Exception } }; } - - public final @Rule CleanupRule cleanup = new CleanupRule(); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/HighIdTransactionApplierTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/HighIdTransactionApplierTest.java index d38b89ace13ff..ac0c209470350 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/HighIdTransactionApplierTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/HighIdTransactionApplierTest.java @@ -24,7 +24,7 @@ import org.neo4j.kernel.impl.store.NeoStores; import org.neo4j.kernel.impl.store.PropertyType; -import org.neo4j.test.NeoStoresRule; +import org.neo4j.test.rule.NeoStoresRule; import static org.junit.Assert.assertEquals; import static org.neo4j.kernel.api.index.SchemaIndexProvider.NO_INDEX_PROVIDER; 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 7672408ac9efc..646793f258deb 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 @@ -44,7 +44,6 @@ import org.neo4j.kernel.impl.api.index.inmemory.InMemoryIndexProviderFactory; import org.neo4j.kernel.impl.api.state.TxState; import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageEngine; -import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageEngineRule; import org.neo4j.kernel.impl.store.NeoStores; import org.neo4j.kernel.impl.store.NodeStore; import org.neo4j.kernel.impl.transaction.command.Command.NodeCommand; @@ -53,14 +52,13 @@ import org.neo4j.storageengine.api.StorageStatement; import org.neo4j.storageengine.api.TransactionApplicationMode; import org.neo4j.storageengine.api.schema.IndexReader; -import org.neo4j.test.PageCacheRule; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.PageCacheRule; +import org.neo4j.test.rule.RecordStorageEngineRule; +import org.neo4j.test.rule.TargetDirectory; import org.neo4j.unsafe.impl.batchimport.cache.idmapping.string.Workers; -import static org.junit.Assert.assertEquals; - import static java.util.Arrays.asList; - +import static org.junit.Assert.assertEquals; import static org.neo4j.helpers.TimeUtil.parseTimeMillis; import static org.neo4j.kernel.api.properties.Property.noNodeProperty; import static org.neo4j.kernel.api.properties.Property.property; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/BatchingTransactionAppenderTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/BatchingTransactionAppenderTest.java index 66985c513d357..8b3f9f62232b2 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/BatchingTransactionAppenderTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/BatchingTransactionAppenderTest.java @@ -45,7 +45,7 @@ import org.neo4j.kernel.internal.DatabaseHealth; import org.neo4j.kernel.lifecycle.LifeRule; import org.neo4j.storageengine.api.StorageCommand; -import org.neo4j.test.CleanupRule; +import org.neo4j.test.rule.CleanupRule; import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertArrayEquals; @@ -74,6 +74,8 @@ public class BatchingTransactionAppenderTest { @Rule public final LifeRule life = new LifeRule( true ); + @Rule + public final CleanupRule cleanup = new CleanupRule(); private final InMemoryVersionableReadableClosablePositionAwareChannel channel = new InMemoryVersionableReadableClosablePositionAwareChannel(); private final LogAppendEvent logAppendEvent = LogAppendEvent.NULL; @@ -352,8 +354,6 @@ public void shouldKernelPanicIfNotAbleToWriteACheckPoint() throws Throwable verify( databaseHealth, times( 1 ) ).panic( ioex ); } - public final @Rule CleanupRule cleanup = new CleanupRule(); - private TransactionRepresentation transaction( Collection commands, byte[] additionalHeader, int masterId, int authorId, long timeStarted, long latestCommittedTxWhenStarted, long timeCommitted ) { 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 cfb21986c1059..b7dd5064de88f 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 @@ -19,6 +19,9 @@ */ package org.neo4j.kernel.impl.transaction.log; +import org.junit.Rule; +import org.junit.Test; + import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -27,14 +30,11 @@ import java.nio.channels.ClosedChannelException; import java.util.Random; -import org.junit.Rule; -import org.junit.Test; - import org.neo4j.io.fs.DefaultFileSystemAbstraction; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.fs.StoreChannel; -import org.neo4j.test.TargetDirectory; -import org.neo4j.test.TargetDirectory.TestDirectory; +import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory.TestDirectory; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; 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 8facde133b20e..8fbe3d9b0e862 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 @@ -19,13 +19,13 @@ */ package org.neo4j.kernel.impl.transaction.log; +import org.junit.Rule; +import org.junit.Test; + import java.io.File; import java.io.IOException; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.Rule; -import org.junit.Test; - import org.neo4j.io.fs.DefaultFileSystemAbstraction; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.kernel.impl.transaction.DeadSimpleLogVersionRepository; @@ -33,14 +33,13 @@ 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.TargetDirectory; -import org.neo4j.test.TargetDirectory.TestDirectory; +import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory.TestDirectory; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; - import static org.neo4j.kernel.impl.transaction.log.entry.LogHeaderReader.readLogHeader; public class PhysicalLogFileTest 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 a401ef3b1210c..a49b3d72ea37c 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.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static java.lang.String.format; import static org.hamcrest.CoreMatchers.equalTo; @@ -66,7 +66,7 @@ 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.TargetDirectory.testDirForTest; +import static org.neo4j.test.rule.TargetDirectory.testDirForTest; public class PhysicalLogicalTransactionStoreTest { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/checkpoint/CheckPointerIntegrationTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/checkpoint/CheckPointerIntegrationTest.java index 73be2f12660f6..c4366660ca2c6 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/checkpoint/CheckPointerIntegrationTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/checkpoint/CheckPointerIntegrationTest.java @@ -44,8 +44,8 @@ import org.neo4j.kernel.impl.transaction.log.entry.LogEntry; import org.neo4j.kernel.impl.transaction.log.entry.LogEntryReader; import org.neo4j.kernel.impl.transaction.log.entry.VersionAwareLogEntryReader; -import org.neo4j.test.EphemeralFileSystemRule; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static java.lang.System.getProperty; import static org.junit.Assert.assertEquals; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/entry/TestTxEntries.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/entry/TestTxEntries.java index 0bee7ffae328d..49bd3f1062ca3 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/entry/TestTxEntries.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/entry/TestTxEntries.java @@ -19,20 +19,20 @@ */ package org.neo4j.kernel.impl.transaction.log.entry; -import java.io.File; - import org.junit.Rule; import org.junit.Test; +import java.io.File; + import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.RelationshipType; import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction; -import org.neo4j.test.EphemeralFileSystemRule; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; -import static org.neo4j.test.EphemeralFileSystemRule.shutdownDbAction; +import static org.neo4j.test.rule.filesystem.EphemeralFileSystemRule.shutdownDbAction; public class TestTxEntries { 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 b461198e8275e..2dacdbf0830f2 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.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static java.lang.System.currentTimeMillis; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/ApplyRecoveredTransactionsTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/ApplyRecoveredTransactionsTest.java index 4e2cdde44dec9..8ebfe62f22438 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/ApplyRecoveredTransactionsTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/ApplyRecoveredTransactionsTest.java @@ -28,14 +28,14 @@ import java.util.Arrays; import org.neo4j.io.fs.FileSystemAbstraction; -import org.neo4j.kernel.impl.store.format.lowlimit.LowLimitV3_0; -import org.neo4j.kernel.impl.store.id.DefaultIdGeneratorFactory; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.TransactionToApply; import org.neo4j.kernel.impl.core.CacheAccessBackDoor; import org.neo4j.kernel.impl.locking.LockService; import org.neo4j.kernel.impl.store.NeoStores; import org.neo4j.kernel.impl.store.StoreFactory; +import org.neo4j.kernel.impl.store.format.lowlimit.LowLimitV3_0; +import org.neo4j.kernel.impl.store.id.DefaultIdGeneratorFactory; import org.neo4j.kernel.impl.store.record.AbstractBaseRecord; import org.neo4j.kernel.impl.store.record.NodeRecord; import org.neo4j.kernel.impl.store.record.RelationshipRecord; @@ -47,8 +47,8 @@ import org.neo4j.kernel.impl.transaction.command.NeoStoreBatchTransactionApplier; import org.neo4j.kernel.impl.transaction.log.PhysicalTransactionRepresentation; import org.neo4j.logging.NullLogProvider; -import org.neo4j.test.EphemeralFileSystemRule; -import org.neo4j.test.PageCacheRule; +import org.neo4j.test.rule.PageCacheRule; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.any; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/NeoStoreIndexStoreViewTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/NeoStoreIndexStoreViewTest.java index 68428fa3d3587..7b763cedb011f 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/NeoStoreIndexStoreViewTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/NeoStoreIndexStoreViewTest.java @@ -52,7 +52,7 @@ import org.neo4j.kernel.impl.store.record.NodeRecord; import org.neo4j.kernel.impl.store.record.RecordLoad; import org.neo4j.kernel.internal.GraphDatabaseAPI; -import org.neo4j.test.EmbeddedDatabaseRule; +import org.neo4j.test.rule.EmbeddedDatabaseRule; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/NodeCommandTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/NodeCommandTest.java index 490919b143226..ddbda2b7a481b 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/NodeCommandTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/NodeCommandTest.java @@ -31,13 +31,13 @@ import java.util.List; import java.util.Set; -import org.neo4j.kernel.impl.store.format.lowlimit.LowLimitV3_0; -import org.neo4j.kernel.impl.store.id.DefaultIdGeneratorFactory; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.store.NeoStores; import org.neo4j.kernel.impl.store.NodeLabels; import org.neo4j.kernel.impl.store.NodeStore; import org.neo4j.kernel.impl.store.StoreFactory; +import org.neo4j.kernel.impl.store.format.lowlimit.LowLimitV3_0; +import org.neo4j.kernel.impl.store.id.DefaultIdGeneratorFactory; import org.neo4j.kernel.impl.store.record.DynamicRecord; import org.neo4j.kernel.impl.store.record.NodeRecord; import org.neo4j.kernel.impl.transaction.command.Command; @@ -45,8 +45,8 @@ import org.neo4j.kernel.impl.transaction.log.InMemoryClosableChannel; import org.neo4j.logging.NullLogProvider; import org.neo4j.storageengine.api.CommandReader; -import org.neo4j.test.EphemeralFileSystemRule; -import org.neo4j.test.PageCacheRule; +import org.neo4j.test.rule.PageCacheRule; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static java.util.Collections.singletonList; import static org.hamcrest.MatcherAssert.assertThat; @@ -54,7 +54,6 @@ import static org.neo4j.kernel.impl.store.DynamicNodeLabels.dynamicPointer; import static org.neo4j.kernel.impl.store.NodeLabelsField.parseLabelsField; import static org.neo4j.kernel.impl.store.ShortArray.LONG; - import static org.neo4j.kernel.impl.store.record.DynamicRecord.dynamicRecord; import static org.neo4j.kernel.impl.util.IoPrimitiveUtils.safeCastLongToInt; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/NodeLabelsFieldTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/NodeLabelsFieldTest.java index ea611d0fb1deb..4d06be8c5e73b 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/NodeLabelsFieldTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/NodeLabelsFieldTest.java @@ -52,15 +52,14 @@ import org.neo4j.kernel.impl.store.record.NodeRecord; import org.neo4j.kernel.impl.util.Bits; import org.neo4j.logging.NullLogProvider; -import org.neo4j.test.EphemeralFileSystemRule; -import org.neo4j.test.PageCacheRule; -import org.neo4j.test.RandomRule; +import org.neo4j.test.rule.PageCacheRule; +import org.neo4j.test.rule.RandomRule; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; - import static org.neo4j.helpers.collection.MapUtil.stringMap; import static org.neo4j.kernel.impl.util.Bits.bits; import static org.neo4j.kernel.impl.util.IoPrimitiveUtils.safeCastLongToInt; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/PropertyLoaderTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/PropertyLoaderTest.java index caea0adf8801d..e13bc3c57ed77 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/PropertyLoaderTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/PropertyLoaderTest.java @@ -44,7 +44,7 @@ import org.neo4j.kernel.impl.store.record.PropertyRecord; import org.neo4j.kernel.impl.store.record.RecordLoad; import org.neo4j.kernel.impl.store.record.RelationshipRecord; -import org.neo4j.test.EmbeddedDatabaseRule; +import org.neo4j.test.rule.EmbeddedDatabaseRule; import static java.util.Arrays.asList; import static org.hamcrest.Matchers.startsWith; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/RelationshipCreatorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/RelationshipCreatorTest.java index 32957c02cab0d..f42eee53437dc 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/RelationshipCreatorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/RelationshipCreatorTest.java @@ -50,8 +50,8 @@ import org.neo4j.storageengine.api.lock.AcquireLockTimeoutException; import org.neo4j.storageengine.api.lock.ResourceType; import org.neo4j.storageengine.api.schema.SchemaRule; -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.unsafe.batchinsert.DirectRecordAccessSet; import static org.junit.Assert.assertEquals; @@ -60,6 +60,26 @@ public class RelationshipCreatorTest { + + private static final int DENSE_NODE_THRESHOLD = 5; + @Rule + public final DatabaseRule dbRule = new ImpermanentDatabaseRule() + { + @Override + protected void configure( GraphDatabaseBuilder builder ) + { + builder.setConfig( GraphDatabaseSettings.dense_node_threshold, String.valueOf( DENSE_NODE_THRESHOLD ) ); + } + }; + private IdGeneratorFactory idGeneratorFactory; + + @Before + public void before() + { + idGeneratorFactory = dbRule.getGraphDatabaseAPI().getDependencyResolver().resolveDependency( + IdGeneratorFactory.class ); + } + @Test public void shouldOnlyChangeLockedRecordsWhenUpgradingToDenseNode() throws Exception { @@ -195,22 +215,4 @@ public int changeSize() return delegate.changeSize(); } } - - private static final int DENSE_NODE_THRESHOLD = 5; - public final @Rule DatabaseRule dbRule = new ImpermanentDatabaseRule() - { - @Override - protected void configure( GraphDatabaseBuilder builder ) - { - builder.setConfig( GraphDatabaseSettings.dense_node_threshold, String.valueOf( DENSE_NODE_THRESHOLD ) ); - } - }; - private IdGeneratorFactory idGeneratorFactory; - - @Before - public void before() - { - idGeneratorFactory = dbRule.getGraphDatabaseAPI().getDependencyResolver().resolveDependency( - IdGeneratorFactory.class ); - } } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/RelationshipGroupGetterTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/RelationshipGroupGetterTest.java index d24cad4632057..1be08c75823e3 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/RelationshipGroupGetterTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/RelationshipGroupGetterTest.java @@ -36,8 +36,8 @@ import org.neo4j.kernel.impl.store.record.RelationshipGroupRecord; import org.neo4j.kernel.impl.transaction.state.RelationshipGroupGetter.RelationshipGroupPosition; import org.neo4j.logging.NullLogProvider; -import org.neo4j.test.EphemeralFileSystemRule; -import org.neo4j.test.PageCacheRule; +import org.neo4j.test.rule.PageCacheRule; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import org.neo4j.unsafe.batchinsert.DirectRecordAccess; import static org.junit.Assert.assertEquals; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/TransactionRecordStateTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/TransactionRecordStateTest.java index f099eb8bc87ef..5c71c0935d95d 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/TransactionRecordStateTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/TransactionRecordStateTest.java @@ -82,7 +82,7 @@ import org.neo4j.kernel.impl.transaction.state.RecordAccess.RecordProxy; import org.neo4j.storageengine.api.StorageCommand; import org.neo4j.storageengine.api.schema.SchemaRule; -import org.neo4j.test.NeoStoresRule; +import org.neo4j.test.rule.NeoStoresRule; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; 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 20d25871665bb..314cf80e27aa9 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,11 +25,10 @@ import java.io.File; import java.io.IOException; -import org.neo4j.test.TargetDirectory; -import org.neo4j.test.TargetDirectory.TestDirectory; +import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory.TestDirectory; import static org.junit.Assert.assertArrayEquals; - import static org.neo4j.kernel.impl.util.Converters.regexFiles; public class ConvertersTest 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 bf4c32a33f388..e8c80707be60c 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.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/PrimitiveIteratorMatchers.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/PrimitiveIteratorMatchers.java deleted file mode 100644 index bd823b3374314..0000000000000 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/PrimitiveIteratorMatchers.java +++ /dev/null @@ -1,85 +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.kernel.impl.util; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import org.hamcrest.Description; -import org.hamcrest.Matcher; -import org.hamcrest.TypeSafeMatcher; - -import org.neo4j.collection.primitive.PrimitiveLongCollections; -import org.neo4j.collection.primitive.PrimitiveLongIterator; - -import static junit.framework.TestCase.fail; - -public class PrimitiveIteratorMatchers -{ - // Unordered! - public static Matcher containsLongs(final long ... longs) - { - return new TypeSafeMatcher() - { - @Override - protected boolean matchesSafely( PrimitiveLongIterator item ) - { - List actual = PrimitiveLongCollections.asList( item ); - List expected = expected(); - - eachActual: - for ( Long actualValue : actual ) - { - Iterator expectedIt = expected.iterator(); - while(expectedIt.hasNext()) - { - if(expectedIt.next().equals( actualValue )) - { - expectedIt.remove(); - continue eachActual; - } - } - - fail( "Got unexpected value: " + actualValue ); - } - - return expected.size() == 0; - } - - private List expected() - { - List expected = new ArrayList<>(); - for ( long v : longs ) - { - expected.add( v ); - } - return expected; - } - - @Override - public void describeTo( Description description ) - { - description.appendValueList( "[", ",", "]", expected() ); - } - }; - } - -} 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 10ac17e41b400..6e9c8b8d5f3df 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,8 +24,8 @@ import java.io.IOException; -import org.neo4j.test.TargetDirectory; -import org.neo4j.test.TargetDirectory.TestDirectory; +import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory.TestDirectory; import static org.junit.Assert.fail; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/dbstructure/GraphDbStructureGuideTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/dbstructure/GraphDbStructureGuideTest.java index 9bec6b71d6664..d375d4840e155 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/dbstructure/GraphDbStructureGuideTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/dbstructure/GraphDbStructureGuideTest.java @@ -39,7 +39,7 @@ import org.neo4j.kernel.api.index.IndexDescriptor; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; import org.neo4j.kernel.internal.GraphDatabaseAPI; -import org.neo4j.test.ImpermanentDatabaseRule; +import org.neo4j.test.rule.ImpermanentDatabaseRule; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/internal/KernelDataTest.java b/community/kernel/src/test/java/org/neo4j/kernel/internal/KernelDataTest.java index 6a84ef099f1a5..6f1342b090aa8 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/internal/KernelDataTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/internal/KernelDataTest.java @@ -33,7 +33,7 @@ import org.neo4j.io.fs.DefaultFileSystemAbstraction; import org.neo4j.kernel.configuration.Config; -import org.neo4j.test.PageCacheRule; +import org.neo4j.test.rule.PageCacheRule; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; 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 1c260cd40fae8..c408142c8961e 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 @@ -29,9 +29,9 @@ import org.neo4j.graphdb.factory.GraphDatabaseSettings; import org.neo4j.kernel.StoreLockException; import org.neo4j.kernel.configuration.Settings; -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 static org.hamcrest.core.IsInstanceOf.instanceOf; import static org.junit.Assert.assertThat; 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 815b8dffd262a..acb5b6e2d9516 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 @@ -34,8 +34,8 @@ import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.fs.StoreChannel; import org.neo4j.kernel.StoreLockException; -import org.neo4j.test.TargetDirectory; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.TargetDirectory; import static java.lang.String.format; import static org.hamcrest.CoreMatchers.containsString; 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 cbd601e9e53c8..8f9466c6ef39c 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.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/community/kernel/src/test/java/org/neo4j/metatest/TargetDirectoryTest.java b/community/kernel/src/test/java/org/neo4j/metatest/TargetDirectoryTest.java deleted file mode 100644 index 372bb2b90a8fa..0000000000000 --- a/community/kernel/src/test/java/org/neo4j/metatest/TargetDirectoryTest.java +++ /dev/null @@ -1,38 +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.metatest; - -import org.junit.Rule; -import org.junit.Test; - -import org.neo4j.test.TargetDirectory; - -import static org.junit.Assert.assertNotNull; - -public class TargetDirectoryTest -{ - public @Rule TargetDirectory.TestDirectory dir = TargetDirectory.testDirForTest( TargetDirectoryTest.class ); - - @Test - public void hasDir() throws Exception - { - assertNotNull( dir ); - } -} diff --git a/community/kernel/src/test/java/org/neo4j/metatest/TestCleanupRule.java b/community/kernel/src/test/java/org/neo4j/metatest/TestCleanupRule.java index f8cec30e64b44..da5b641f9ba68 100644 --- a/community/kernel/src/test/java/org/neo4j/metatest/TestCleanupRule.java +++ b/community/kernel/src/test/java/org/neo4j/metatest/TestCleanupRule.java @@ -23,7 +23,7 @@ import org.junit.runners.model.Statement; import org.mockito.InOrder; -import org.neo4j.test.CleanupRule; +import org.neo4j.test.rule.CleanupRule; import static org.junit.Assert.fail; import static org.mockito.Mockito.inOrder; 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 8ffa08d060d6f..f25584a86d724 100644 --- a/community/kernel/src/test/java/org/neo4j/metatest/TestJavaTestDocsGenerator.java +++ b/community/kernel/src/test/java/org/neo4j/metatest/TestJavaTestDocsGenerator.java @@ -37,9 +37,9 @@ import org.neo4j.test.GraphDescription.Graph; import org.neo4j.test.GraphHolder; import org.neo4j.test.JavaTestDocsGenerator; -import org.neo4j.test.TargetDirectory; import org.neo4j.test.TestData; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.TargetDirectory; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; diff --git a/community/kernel/src/test/java/org/neo4j/test/FailureOutput.java b/community/kernel/src/test/java/org/neo4j/test/FailureOutput.java deleted file mode 100644 index 4ca009618049f..0000000000000 --- a/community/kernel/src/test/java/org/neo4j/test/FailureOutput.java +++ /dev/null @@ -1,86 +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; - -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.PrintStream; -import java.io.PrintWriter; - -import org.junit.rules.TestRule; -import org.junit.runner.Description; -import org.junit.runners.model.Statement; - -/** - * Utility for capturing output and printing it on test failure only. - */ -public class FailureOutput implements TestRule -{ - private final ByteArrayOutputStream output = new ByteArrayOutputStream(); - private final PrintStream stream = new PrintStream( output ); - private final PrintStream target; - - public FailureOutput() - { - this( System.out ); - } - - public FailureOutput( PrintStream target ) - { - this.target = target; - } - - @Override - public Statement apply( final Statement base, Description description ) - { - return new Statement() - { - @Override - public void evaluate() throws Throwable - { - try - { - base.evaluate(); - } - catch ( Throwable failure ) - { - printOutput(); - throw failure; - } - } - }; - } - - private void printOutput() throws IOException - { - target.write( output.toByteArray() ); - target.flush(); - } - - public PrintStream stream() - { - return stream; - } - - public PrintWriter writer() - { - return new PrintWriter( stream ); - } -} diff --git a/community/kernel/src/test/java/org/neo4j/test/OtherThreadExecutor.java b/community/kernel/src/test/java/org/neo4j/test/OtherThreadExecutor.java index 5b8ea8e2e07b3..54724b7978033 100644 --- a/community/kernel/src/test/java/org/neo4j/test/OtherThreadExecutor.java +++ b/community/kernel/src/test/java/org/neo4j/test/OtherThreadExecutor.java @@ -167,7 +167,7 @@ public R execute( WorkerCommand cmd, long timeout, TimeUnit unit ) thr } } - void awaitStartExecuting() throws InterruptedException + public void awaitStartExecuting() throws InterruptedException { while ( executionState == ExecutionState.REQUESTED_EXECUTION ) { @@ -364,7 +364,7 @@ public void interrupt() } } - void printStackTrace( PrintStream out ) + public void printStackTrace( PrintStream out ) { Thread thread = getThread(); out.println( thread ); diff --git a/community/kernel/src/test/java/org/neo4j/test/ProcessStreamHandler.java b/community/kernel/src/test/java/org/neo4j/test/ProcessStreamHandler.java index 1f3175d61fc33..ff3ac21bab7cb 100644 --- a/community/kernel/src/test/java/org/neo4j/test/ProcessStreamHandler.java +++ b/community/kernel/src/test/java/org/neo4j/test/ProcessStreamHandler.java @@ -42,7 +42,7 @@ public class ProcessStreamHandler /** * Convenience constructor assuming the local output streams are - * {@link System.out} and {@link System.err} for the process's OutputStream + * {@link System#out} and {@link System#err} for the process's OutputStream * and ErrorStream respectively. * * Set quiet to true if you just want to consume the output to avoid locking up the process. diff --git a/community/kernel/src/test/java/org/neo4j/test/Assert.java b/community/kernel/src/test/java/org/neo4j/test/assertion/Assert.java similarity index 98% rename from community/kernel/src/test/java/org/neo4j/test/Assert.java rename to community/kernel/src/test/java/org/neo4j/test/assertion/Assert.java index 4a8ec6fad96be..74cd706b79ab4 100644 --- a/community/kernel/src/test/java/org/neo4j/test/Assert.java +++ b/community/kernel/src/test/java/org/neo4j/test/assertion/Assert.java @@ -17,18 +17,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.test; +package org.neo4j.test.assertion; import org.hamcrest.Description; import org.hamcrest.Matcher; import org.hamcrest.StringDescription; -import org.neo4j.function.ThrowingSupplier; -import org.neo4j.helpers.ArrayUtil; -import org.neo4j.helpers.Strings; import java.util.Objects; import java.util.concurrent.TimeUnit; +import org.neo4j.function.ThrowingSupplier; +import org.neo4j.helpers.ArrayUtil; +import org.neo4j.helpers.Strings; + public final class Assert { private Assert() diff --git a/community/kernel/src/test/java/org/neo4j/test/impl/MultipleExceptionsStrategy.java b/community/kernel/src/test/java/org/neo4j/test/impl/MultipleExceptionsStrategy.java deleted file mode 100644 index 36af754944250..0000000000000 --- a/community/kernel/src/test/java/org/neo4j/test/impl/MultipleExceptionsStrategy.java +++ /dev/null @@ -1,100 +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.impl; - -import java.util.List; - -import static org.neo4j.helpers.Exceptions.launderedException; - -public abstract class MultipleExceptionsStrategy -{ - public static void assertEmpty( List failures ) throws Throwable - { - if ( failures.isEmpty() ) return; - if ( failures.size() == 1 ) throw failures.get( 0 ); - throw strategy.aggregate( failures ); - } - - public static void assertEmptyExceptions( List exceptions ) throws Exception - { - try - { - assertEmpty( unsafeCast(exceptions) ); - } - catch ( Throwable e ) - { - throw launderedException( Exception.class, e ); - } - } - - private static final MultipleExceptionsStrategy strategy; - static - { - MultipleExceptionsStrategy choice = new ChainedMultipleExceptionsStrategy(); - String pkg = MultipleExceptionsStrategy.class.getPackage().getName(); - ClassLoader loader = MultipleExceptionsStrategy.class.getClassLoader(); - for ( String name : new String[] { "JUnitMultipleExceptions" } ) - { - try - { - choice = (MultipleExceptionsStrategy) loader.loadClass( pkg + "." + name ).newInstance(); - } - catch ( Throwable e ) - { - continue; - } - break; - } - strategy = choice; - } - - abstract Throwable aggregate( List failures ); - - MultipleExceptionsStrategy() - { - // subclasses live in this package - } - - private static class ChainedMultipleExceptionsStrategy extends MultipleExceptionsStrategy - { - @Override - Throwable aggregate( List failures ) - { - Throwable result = null; - for ( Throwable throwable : failures ) - { - Throwable last = throwable; - for ( Throwable cause = last.getCause(); cause != null; cause = cause.getCause() ) - { - last = cause; - } - last.initCause( result ); - result = throwable; - } - return null; - } - } - - @SuppressWarnings( "unchecked" ) - private static List unsafeCast( List exceptions ) - { - return (List)exceptions; - } -} diff --git a/community/kernel/src/test/java/org/neo4j/test/AwaitAnswer.java b/community/kernel/src/test/java/org/neo4j/test/mockito/answer/AwaitAnswer.java similarity index 93% rename from community/kernel/src/test/java/org/neo4j/test/AwaitAnswer.java rename to community/kernel/src/test/java/org/neo4j/test/mockito/answer/AwaitAnswer.java index 3b194c3cf40ae..a60f9abe12ea8 100644 --- a/community/kernel/src/test/java/org/neo4j/test/AwaitAnswer.java +++ b/community/kernel/src/test/java/org/neo4j/test/mockito/answer/AwaitAnswer.java @@ -17,20 +17,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.test; - -import java.util.concurrent.CountDownLatch; +package org.neo4j.test.mockito.answer; import org.mockito.internal.stubbing.answers.Returns; import org.mockito.internal.stubbing.answers.ThrowsException; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; +import java.util.concurrent.CountDownLatch; + public class AwaitAnswer implements Answer { public static AwaitAnswer afterAwaiting( CountDownLatch latch ) { - return new AwaitAnswer( latch, null ); + return new AwaitAnswer<>( latch, null ); } private final CountDownLatch latch; @@ -51,7 +51,7 @@ public T answer( InvocationOnMock invocation ) throws Throwable public Answer then( Answer result ) { - return new AwaitAnswer( latch, result ); + return new AwaitAnswer<>( latch, result ); } @SuppressWarnings("unchecked") diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/Neo4jMockitoHelpers.java b/community/kernel/src/test/java/org/neo4j/test/mockito/answer/Neo4jMockitoAnswers.java similarity index 56% rename from community/kernel/src/test/java/org/neo4j/graphdb/Neo4jMockitoHelpers.java rename to community/kernel/src/test/java/org/neo4j/test/mockito/answer/Neo4jMockitoAnswers.java index aa3da938d0a00..0cf43ca63acd8 100644 --- a/community/kernel/src/test/java/org/neo4j/graphdb/Neo4jMockitoHelpers.java +++ b/community/kernel/src/test/java/org/neo4j/test/mockito/answer/Neo4jMockitoAnswers.java @@ -17,9 +17,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.graphdb; +package org.neo4j.test.mockito.answer; -import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import java.util.Iterator; @@ -28,53 +27,25 @@ import org.neo4j.collection.primitive.PrimitiveIntIterator; import org.neo4j.collection.primitive.PrimitiveLongCollections; import org.neo4j.collection.primitive.PrimitiveLongIterator; -import org.neo4j.collection.primitive.PrimitiveLongResourceIterator; +import org.neo4j.graphdb.Resource; import static org.neo4j.collection.primitive.PrimitiveLongCollections.toPrimitiveIterator; -public class Neo4jMockitoHelpers +public class Neo4jMockitoAnswers { public static Answer> answerAsIteratorFrom( final Iterable values ) { - return new Answer>() - { - @Override - public Iterator answer( InvocationOnMock invocation ) throws Throwable - { - return values.iterator(); - } - }; + return invocation -> values.iterator(); } public static Answer answerAsPrimitiveLongIteratorFrom( final Iterable values ) { - return new Answer() - { - @Override - public PrimitiveLongResourceIterator answer( InvocationOnMock invocation ) throws Throwable - { - return PrimitiveLongCollections.resourceIterator( toPrimitiveIterator( values.iterator() ), NO_RESOURCE ); - } - }; + return invocation -> PrimitiveLongCollections.resourceIterator( toPrimitiveIterator( values.iterator() ), + Resource.EMPTY ); } public static Answer answerAsPrimitiveIntIteratorFrom( final Iterable values ) { - return new Answer() - { - @Override - public PrimitiveIntIterator answer( InvocationOnMock invocation ) throws Throwable - { - return PrimitiveIntCollections.toPrimitiveIterator( values.iterator() ); - } - }; + return invocation -> PrimitiveIntCollections.toPrimitiveIterator( values.iterator() ); } - - public static final Resource NO_RESOURCE = new Resource() - { - @Override - public void close() - { - } - }; } diff --git a/community/kernel/src/test/java/org/neo4j/test/IterableMatcher.java b/community/kernel/src/test/java/org/neo4j/test/mockito/matcher/IterableMatcher.java similarity index 98% rename from community/kernel/src/test/java/org/neo4j/test/IterableMatcher.java rename to community/kernel/src/test/java/org/neo4j/test/mockito/matcher/IterableMatcher.java index 3cec78a31bc44..be541d7be6d13 100644 --- a/community/kernel/src/test/java/org/neo4j/test/IterableMatcher.java +++ b/community/kernel/src/test/java/org/neo4j/test/mockito/matcher/IterableMatcher.java @@ -17,12 +17,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.test; - -import java.util.Iterator; +package org.neo4j.test.mockito.matcher; import org.hamcrest.Description; import org.hamcrest.TypeSafeMatcher; + +import java.util.Iterator; + import org.neo4j.helpers.collection.Iterables; /** diff --git a/community/kernel/src/test/java/org/neo4j/test/KernelExceptionUserMessageMatcher.java b/community/kernel/src/test/java/org/neo4j/test/mockito/matcher/KernelExceptionUserMessageMatcher.java similarity index 98% rename from community/kernel/src/test/java/org/neo4j/test/KernelExceptionUserMessageMatcher.java rename to community/kernel/src/test/java/org/neo4j/test/mockito/matcher/KernelExceptionUserMessageMatcher.java index 5f7b3030b67cd..5dc5467021842 100644 --- a/community/kernel/src/test/java/org/neo4j/test/KernelExceptionUserMessageMatcher.java +++ b/community/kernel/src/test/java/org/neo4j/test/mockito/matcher/KernelExceptionUserMessageMatcher.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.test; +package org.neo4j.test.mockito.matcher; import org.hamcrest.BaseMatcher; import org.hamcrest.Description; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/LogMatchers.java b/community/kernel/src/test/java/org/neo4j/test/mockito/matcher/LogMatchers.java similarity index 99% rename from community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/LogMatchers.java rename to community/kernel/src/test/java/org/neo4j/test/mockito/matcher/LogMatchers.java index 76d767afeff72..25ababdb5d3d2 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/LogMatchers.java +++ b/community/kernel/src/test/java/org/neo4j/test/mockito/matcher/LogMatchers.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.impl.transaction; +package org.neo4j.test.mockito.matcher; import org.hamcrest.Description; import org.hamcrest.Matcher; diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/Neo4jMatchers.java b/community/kernel/src/test/java/org/neo4j/test/mockito/matcher/Neo4jMatchers.java similarity index 98% rename from community/kernel/src/test/java/org/neo4j/graphdb/Neo4jMatchers.java rename to community/kernel/src/test/java/org/neo4j/test/mockito/matcher/Neo4jMatchers.java index 3761b342312d7..d72a37a66e57d 100644 --- a/community/kernel/src/test/java/org/neo4j/graphdb/Neo4jMatchers.java +++ b/community/kernel/src/test/java/org/neo4j/test/mockito/matcher/Neo4jMatchers.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.graphdb; +package org.neo4j.test.mockito.matcher; import org.hamcrest.Description; import org.hamcrest.DiagnosingMatcher; @@ -32,6 +32,12 @@ import java.util.Set; import org.neo4j.collection.primitive.PrimitiveLongIterator; +import org.neo4j.graphdb.GraphDatabaseService; +import org.neo4j.graphdb.Label; +import org.neo4j.graphdb.Node; +import org.neo4j.graphdb.PropertyContainer; +import org.neo4j.graphdb.RelationshipType; +import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.schema.ConstraintDefinition; import org.neo4j.graphdb.schema.IndexDefinition; import org.neo4j.graphdb.schema.Schema; diff --git a/community/kernel/src/test/java/org/neo4j/test/RegexMatcher.java b/community/kernel/src/test/java/org/neo4j/test/mockito/matcher/RegexMatcher.java similarity index 97% rename from community/kernel/src/test/java/org/neo4j/test/RegexMatcher.java rename to community/kernel/src/test/java/org/neo4j/test/mockito/matcher/RegexMatcher.java index 3d18f48a30d5d..f211745ae0a96 100644 --- a/community/kernel/src/test/java/org/neo4j/test/RegexMatcher.java +++ b/community/kernel/src/test/java/org/neo4j/test/mockito/matcher/RegexMatcher.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.test; +package org.neo4j.test.mockito.matcher; import org.hamcrest.Description; import org.hamcrest.Matcher; diff --git a/community/kernel/src/test/java/org/neo4j/test/mocking/GraphMock.java b/community/kernel/src/test/java/org/neo4j/test/mockito/mock/GraphMock.java similarity index 95% rename from community/kernel/src/test/java/org/neo4j/test/mocking/GraphMock.java rename to community/kernel/src/test/java/org/neo4j/test/mockito/mock/GraphMock.java index 56d053bb91ec0..275b98818777d 100644 --- a/community/kernel/src/test/java/org/neo4j/test/mocking/GraphMock.java +++ b/community/kernel/src/test/java/org/neo4j/test/mockito/mock/GraphMock.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.test.mocking; +package org.neo4j.test.mockito.mock; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -41,7 +41,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.neo4j.helpers.collection.Iterables.reverse; -import static org.neo4j.test.mocking.Properties.properties; public class GraphMock { @@ -57,7 +56,7 @@ public static Label[] labels( String... names ) public static Node node( long id, Label[] labels, Property... properties ) { - return mockNode( id, labels, properties( properties ) ); + return mockNode( id, labels, Properties.properties( properties ) ); } public static Node node( long id, Properties properties, String... labels ) @@ -72,7 +71,7 @@ public static Relationship relationship( long id, Properties properties, Node st public static Relationship relationship( long id, Node start, String type, Node end, Property... properties ) { - return mockRelationship( id, start, type, end, properties( properties ) ); + return mockRelationship( id, start, type, end, Properties.properties( properties ) ); } public static Link link( Relationship relationship, Node node ) diff --git a/community/kernel/src/test/java/org/neo4j/test/mocking/Link.java b/community/kernel/src/test/java/org/neo4j/test/mockito/mock/Link.java similarity index 98% rename from community/kernel/src/test/java/org/neo4j/test/mocking/Link.java rename to community/kernel/src/test/java/org/neo4j/test/mockito/mock/Link.java index ac58807ab458e..a12c2a8bdc39e 100644 --- a/community/kernel/src/test/java/org/neo4j/test/mocking/Link.java +++ b/community/kernel/src/test/java/org/neo4j/test/mockito/mock/Link.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.test.mocking; +package org.neo4j.test.mockito.mock; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Relationship; diff --git a/community/kernel/src/test/java/org/neo4j/test/mocking/Properties.java b/community/kernel/src/test/java/org/neo4j/test/mockito/mock/Properties.java similarity index 98% rename from community/kernel/src/test/java/org/neo4j/test/mocking/Properties.java rename to community/kernel/src/test/java/org/neo4j/test/mockito/mock/Properties.java index 4b4ebfafd597d..3e9ae3c8b99e4 100644 --- a/community/kernel/src/test/java/org/neo4j/test/mocking/Properties.java +++ b/community/kernel/src/test/java/org/neo4j/test/mockito/mock/Properties.java @@ -17,16 +17,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.test.mocking; +package org.neo4j.test.mockito.mock; + +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; import java.util.Iterator; import java.util.Map; import java.util.SortedMap; import java.util.TreeMap; -import org.mockito.invocation.InvocationOnMock; -import org.mockito.stubbing.Answer; - import org.neo4j.graphdb.NotFoundException; import org.neo4j.test.Property; diff --git a/community/kernel/src/test/java/org/neo4j/test/CleanupRule.java b/community/kernel/src/test/java/org/neo4j/test/rule/CleanupRule.java similarity index 99% rename from community/kernel/src/test/java/org/neo4j/test/CleanupRule.java rename to community/kernel/src/test/java/org/neo4j/test/rule/CleanupRule.java index d4ee29a78c5b8..1ebc171cab8f0 100644 --- a/community/kernel/src/test/java/org/neo4j/test/CleanupRule.java +++ b/community/kernel/src/test/java/org/neo4j/test/rule/CleanupRule.java @@ -17,15 +17,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.test; +package org.neo4j.test.rule; + +import org.junit.rules.ExternalResource; import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.LinkedList; -import org.junit.rules.ExternalResource; - /** * Simple means of cleaning up after a test. It has two purposes: * o remove try-finally blocks from tests, which looks mostly like clutter diff --git a/community/kernel/src/test/java/org/neo4j/test/DatabaseRule.java b/community/kernel/src/test/java/org/neo4j/test/rule/DatabaseRule.java similarity index 99% rename from community/kernel/src/test/java/org/neo4j/test/DatabaseRule.java rename to community/kernel/src/test/java/org/neo4j/test/rule/DatabaseRule.java index 748bfc9c6526e..f9088571e96f4 100644 --- a/community/kernel/src/test/java/org/neo4j/test/DatabaseRule.java +++ b/community/kernel/src/test/java/org/neo4j/test/rule/DatabaseRule.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.test; +package org.neo4j.test.rule; import java.io.File; import java.io.IOException; diff --git a/community/kernel/src/test/java/org/neo4j/test/EmbeddedDatabaseRule.java b/community/kernel/src/test/java/org/neo4j/test/rule/EmbeddedDatabaseRule.java similarity index 95% rename from community/kernel/src/test/java/org/neo4j/test/EmbeddedDatabaseRule.java rename to community/kernel/src/test/java/org/neo4j/test/rule/EmbeddedDatabaseRule.java index 4b441fc43f4e5..73e7be8b0cc17 100644 --- a/community/kernel/src/test/java/org/neo4j/test/EmbeddedDatabaseRule.java +++ b/community/kernel/src/test/java/org/neo4j/test/rule/EmbeddedDatabaseRule.java @@ -17,19 +17,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.test; +package org.neo4j.test.rule; import org.junit.rules.TemporaryFolder; import java.io.File; import java.io.IOException; -import java.util.Map; import org.neo4j.graphdb.factory.GraphDatabaseBuilder; import org.neo4j.graphdb.factory.GraphDatabaseFactory; import org.neo4j.io.fs.DefaultFileSystemAbstraction; import org.neo4j.io.fs.FileUtils; import org.neo4j.kernel.configuration.Config; +import org.neo4j.test.TestGraphDatabaseFactory; + /** * JUnit @Rule for configuring, creating and managing an EmbeddedGraphDatabase instance. @@ -72,8 +73,7 @@ public EmbeddedDatabaseRule( final Class testClass ) { this.temp = new TempDirectory() { - private final TargetDirectory targetDirectory = - new TargetDirectory( new DefaultFileSystemAbstraction(), testClass ); + private final TargetDirectory targetDirectory = new TargetDirectory( new DefaultFileSystemAbstraction(), testClass ); private File dbDir; @Override diff --git a/community/kernel/src/test/java/org/neo4j/test/ExternalResource.java b/community/kernel/src/test/java/org/neo4j/test/rule/ExternalResource.java similarity index 98% rename from community/kernel/src/test/java/org/neo4j/test/ExternalResource.java rename to community/kernel/src/test/java/org/neo4j/test/rule/ExternalResource.java index 2901f82712232..d3c28944a10fa 100644 --- a/community/kernel/src/test/java/org/neo4j/test/ExternalResource.java +++ b/community/kernel/src/test/java/org/neo4j/test/rule/ExternalResource.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.test; +package org.neo4j.test.rule; import org.junit.rules.TestRule; import org.junit.runner.Description; diff --git a/community/kernel/src/test/java/org/neo4j/test/GraphTransactionRule.java b/community/kernel/src/test/java/org/neo4j/test/rule/GraphTransactionRule.java similarity index 95% rename from community/kernel/src/test/java/org/neo4j/test/GraphTransactionRule.java rename to community/kernel/src/test/java/org/neo4j/test/rule/GraphTransactionRule.java index 5fbdd89350bd0..35777ad97900c 100644 --- a/community/kernel/src/test/java/org/neo4j/test/GraphTransactionRule.java +++ b/community/kernel/src/test/java/org/neo4j/test/rule/GraphTransactionRule.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.test; +package org.neo4j.test.rule; import org.junit.rules.ExternalResource; @@ -27,8 +27,7 @@ * JUnit @Rule for running a transaction for the duration of a test. Requires an EmbeddedDatabaseRule with * whose database the transaction will be executed. */ -public class GraphTransactionRule - extends ExternalResource +public class GraphTransactionRule extends ExternalResource { private final DatabaseRule database; diff --git a/community/kernel/src/test/java/org/neo4j/test/ImpermanentDatabaseRule.java b/community/kernel/src/test/java/org/neo4j/test/rule/ImpermanentDatabaseRule.java similarity index 96% rename from community/kernel/src/test/java/org/neo4j/test/ImpermanentDatabaseRule.java rename to community/kernel/src/test/java/org/neo4j/test/rule/ImpermanentDatabaseRule.java index fde7d899f0846..4e3e09efdb74b 100644 --- a/community/kernel/src/test/java/org/neo4j/test/ImpermanentDatabaseRule.java +++ b/community/kernel/src/test/java/org/neo4j/test/rule/ImpermanentDatabaseRule.java @@ -17,11 +17,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.test; +package org.neo4j.test.rule; import org.neo4j.graphdb.factory.GraphDatabaseBuilder; import org.neo4j.graphdb.factory.GraphDatabaseFactory; import org.neo4j.logging.LogProvider; +import org.neo4j.test.TestGraphDatabaseFactory; /** * JUnit @Rule for configuring, creating and managing an ImpermanentGraphDatabase instance. diff --git a/community/kernel/src/test/java/org/neo4j/test/LoggerRule.java b/community/kernel/src/test/java/org/neo4j/test/rule/LoggerRule.java similarity index 96% rename from community/kernel/src/test/java/org/neo4j/test/LoggerRule.java rename to community/kernel/src/test/java/org/neo4j/test/rule/LoggerRule.java index a7312308da4fc..7069f95ea7abb 100644 --- a/community/kernel/src/test/java/org/neo4j/test/LoggerRule.java +++ b/community/kernel/src/test/java/org/neo4j/test/rule/LoggerRule.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.test; +package org.neo4j.test.rule; import org.junit.rules.ExternalResource; import org.junit.runner.Description; @@ -29,8 +29,7 @@ /** * Creates a logger for tests, and marks beginning and end of tests with log messages */ -public class LoggerRule - extends ExternalResource +public class LoggerRule extends ExternalResource { private final Level level; private Logger logger; diff --git a/community/kernel/src/test/java/org/neo4j/test/NeoStoreDataSourceRule.java b/community/kernel/src/test/java/org/neo4j/test/rule/NeoStoreDataSourceRule.java similarity index 99% rename from community/kernel/src/test/java/org/neo4j/test/NeoStoreDataSourceRule.java rename to community/kernel/src/test/java/org/neo4j/test/rule/NeoStoreDataSourceRule.java index 10f161e939d25..d49be82112392 100644 --- a/community/kernel/src/test/java/org/neo4j/test/NeoStoreDataSourceRule.java +++ b/community/kernel/src/test/java/org/neo4j/test/rule/NeoStoreDataSourceRule.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.test; +package org.neo4j.test.rule; import java.io.File; import java.util.Map; diff --git a/community/kernel/src/test/java/org/neo4j/test/NeoStoresRule.java b/community/kernel/src/test/java/org/neo4j/test/rule/NeoStoresRule.java similarity index 99% rename from community/kernel/src/test/java/org/neo4j/test/NeoStoresRule.java rename to community/kernel/src/test/java/org/neo4j/test/rule/NeoStoresRule.java index c7d6f5dbda495..268df27098f0b 100644 --- a/community/kernel/src/test/java/org/neo4j/test/NeoStoresRule.java +++ b/community/kernel/src/test/java/org/neo4j/test/rule/NeoStoresRule.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.test; +package org.neo4j.test.rule; import java.io.File; diff --git a/community/kernel/src/test/java/org/neo4j/test/PageCacheRule.java b/community/kernel/src/test/java/org/neo4j/test/rule/PageCacheRule.java similarity index 99% rename from community/kernel/src/test/java/org/neo4j/test/PageCacheRule.java rename to community/kernel/src/test/java/org/neo4j/test/rule/PageCacheRule.java index d0fb872a5c24a..df0a73f391635 100644 --- a/community/kernel/src/test/java/org/neo4j/test/PageCacheRule.java +++ b/community/kernel/src/test/java/org/neo4j/test/rule/PageCacheRule.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.test; +package org.neo4j.test.rule; import java.io.IOException; import java.util.HashMap; diff --git a/community/kernel/src/test/java/org/neo4j/test/RandomRule.java b/community/kernel/src/test/java/org/neo4j/test/rule/RandomRule.java similarity index 98% rename from community/kernel/src/test/java/org/neo4j/test/RandomRule.java rename to community/kernel/src/test/java/org/neo4j/test/rule/RandomRule.java index ffc6113e99a17..0e5290fd7e1c8 100644 --- a/community/kernel/src/test/java/org/neo4j/test/RandomRule.java +++ b/community/kernel/src/test/java/org/neo4j/test/rule/RandomRule.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.test; +package org.neo4j.test.rule; import org.junit.rules.TestRule; import org.junit.runner.Description; @@ -25,6 +25,7 @@ import java.util.Random; +import org.neo4j.test.Randoms; import org.neo4j.test.Randoms.Configuration; import static java.lang.System.currentTimeMillis; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordStorageEngineRule.java b/community/kernel/src/test/java/org/neo4j/test/rule/RecordStorageEngineRule.java similarity index 98% rename from community/kernel/src/test/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordStorageEngineRule.java rename to community/kernel/src/test/java/org/neo4j/test/rule/RecordStorageEngineRule.java index 3d49d7624f356..14c8878ba6fe3 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordStorageEngineRule.java +++ b/community/kernel/src/test/java/org/neo4j/test/rule/RecordStorageEngineRule.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.impl.storageengine.impl.recordstorage; +package org.neo4j.test.rule; import java.io.File; @@ -39,6 +39,7 @@ import org.neo4j.kernel.impl.core.RelationshipTypeTokenHolder; import org.neo4j.kernel.impl.index.IndexConfigStore; import org.neo4j.kernel.impl.locking.ReentrantLockService; +import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageEngine; import org.neo4j.kernel.impl.store.format.RecordFormatSelector; import org.neo4j.kernel.impl.store.format.RecordFormats; import org.neo4j.kernel.impl.store.id.IdGeneratorFactory; @@ -50,8 +51,6 @@ import org.neo4j.kernel.lifecycle.LifeSupport; import org.neo4j.logging.NullLog; import org.neo4j.logging.NullLogProvider; -import org.neo4j.test.ExternalResource; -import org.neo4j.test.PageCacheRule; import org.neo4j.test.impl.EphemeralIdGenerator; import static org.mockito.Mockito.mock; diff --git a/community/kernel/src/test/java/org/neo4j/test/ResourceRule.java b/community/kernel/src/test/java/org/neo4j/test/rule/ResourceRule.java similarity index 99% rename from community/kernel/src/test/java/org/neo4j/test/ResourceRule.java rename to community/kernel/src/test/java/org/neo4j/test/rule/ResourceRule.java index 70cbc709c5f40..37968cfd733b9 100644 --- a/community/kernel/src/test/java/org/neo4j/test/ResourceRule.java +++ b/community/kernel/src/test/java/org/neo4j/test/rule/ResourceRule.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.test; +package org.neo4j.test.rule; import org.junit.rules.TestRule; import org.junit.runner.Description; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/kvstore/Resources.java b/community/kernel/src/test/java/org/neo4j/test/rule/Resources.java similarity index 95% rename from community/kernel/src/test/java/org/neo4j/kernel/impl/store/kvstore/Resources.java rename to community/kernel/src/test/java/org/neo4j/test/rule/Resources.java index 2e7a7537dce43..cbb34b45ad61f 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/kvstore/Resources.java +++ b/community/kernel/src/test/java/org/neo4j/test/rule/Resources.java @@ -17,7 +17,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.impl.store.kvstore; +package org.neo4j.test.rule; + +import org.junit.rules.TestRule; +import org.junit.runner.Description; +import org.junit.runners.model.Statement; import java.io.File; import java.lang.annotation.ElementType; @@ -25,10 +29,6 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.junit.rules.TestRule; -import org.junit.runner.Description; -import org.junit.runners.model.Statement; - import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; import org.neo4j.kernel.lifecycle.LifeRule; @@ -37,11 +37,10 @@ import org.neo4j.kernel.lifecycle.LifecycleException; import org.neo4j.logging.LogProvider; import org.neo4j.logging.NullLogProvider; -import org.neo4j.test.EphemeralFileSystemRule; -import org.neo4j.test.ResourceRule; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; -import static org.neo4j.test.ResourceRule.existingDirectory; -import static org.neo4j.test.ResourceRule.fileInExistingDirectory; +import static org.neo4j.test.rule.ResourceRule.existingDirectory; +import static org.neo4j.test.rule.ResourceRule.fileInExistingDirectory; public final class Resources implements TestRule { diff --git a/community/kernel/src/test/java/org/neo4j/test/SuppressOutput.java b/community/kernel/src/test/java/org/neo4j/test/rule/SuppressOutput.java similarity index 99% rename from community/kernel/src/test/java/org/neo4j/test/SuppressOutput.java rename to community/kernel/src/test/java/org/neo4j/test/rule/SuppressOutput.java index 99a3e363a54b0..84323ab98ed8d 100644 --- a/community/kernel/src/test/java/org/neo4j/test/SuppressOutput.java +++ b/community/kernel/src/test/java/org/neo4j/test/rule/SuppressOutput.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.test; +package org.neo4j.test.rule; import org.junit.rules.TestRule; import org.junit.runner.Description; diff --git a/community/kernel/src/test/java/org/neo4j/test/TimeRule.java b/community/kernel/src/test/java/org/neo4j/test/rule/TimeRule.java similarity index 98% rename from community/kernel/src/test/java/org/neo4j/test/TimeRule.java rename to community/kernel/src/test/java/org/neo4j/test/rule/TimeRule.java index 79ca45b4aa9e2..084528ec865df 100644 --- a/community/kernel/src/test/java/org/neo4j/test/TimeRule.java +++ b/community/kernel/src/test/java/org/neo4j/test/rule/TimeRule.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.test; +package org.neo4j.test.rule; import org.junit.rules.TestRule; import org.junit.runner.Description; diff --git a/community/kernel/src/test/java/org/neo4j/test/rules/VerboseTimeout.java b/community/kernel/src/test/java/org/neo4j/test/rule/VerboseTimeout.java similarity index 99% rename from community/kernel/src/test/java/org/neo4j/test/rules/VerboseTimeout.java rename to community/kernel/src/test/java/org/neo4j/test/rule/VerboseTimeout.java index 8074412067041..6df686e3e4d90 100644 --- a/community/kernel/src/test/java/org/neo4j/test/rules/VerboseTimeout.java +++ b/community/kernel/src/test/java/org/neo4j/test/rule/VerboseTimeout.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.test.rules; +package org.neo4j.test.rule; import org.apache.commons.lang3.StringUtils; import org.junit.rules.Timeout; diff --git a/community/kernel/src/test/java/org/neo4j/test/OtherThreadRule.java b/community/kernel/src/test/java/org/neo4j/test/rule/concurrent/OtherThreadRule.java similarity index 98% rename from community/kernel/src/test/java/org/neo4j/test/OtherThreadRule.java rename to community/kernel/src/test/java/org/neo4j/test/rule/concurrent/OtherThreadRule.java index faf6a2afe34e4..ddd69d9f312e4 100644 --- a/community/kernel/src/test/java/org/neo4j/test/OtherThreadRule.java +++ b/community/kernel/src/test/java/org/neo4j/test/rule/concurrent/OtherThreadRule.java @@ -17,11 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.test; - -import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; +package org.neo4j.test.rule.concurrent; import org.hamcrest.Matcher; import org.hamcrest.TypeSafeMatcher; @@ -29,6 +25,12 @@ import org.junit.runner.Description; import org.junit.runners.model.Statement; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; + +import org.neo4j.test.OtherThreadExecutor; + import static java.util.concurrent.TimeUnit.SECONDS; public class OtherThreadRule implements TestRule diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/locking/ThreadRepository.java b/community/kernel/src/test/java/org/neo4j/test/rule/concurrent/ThreadRepository.java similarity index 99% rename from community/kernel/src/test/java/org/neo4j/kernel/impl/locking/ThreadRepository.java rename to community/kernel/src/test/java/org/neo4j/test/rule/concurrent/ThreadRepository.java index b9133d632d8ed..0d6cf6ec2eaa6 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/locking/ThreadRepository.java +++ b/community/kernel/src/test/java/org/neo4j/test/rule/concurrent/ThreadRepository.java @@ -17,7 +17,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.impl.locking; +package org.neo4j.test.rule.concurrent; + +import org.junit.rules.TestRule; +import org.junit.runner.Description; +import org.junit.runners.model.MultipleFailureException; +import org.junit.runners.model.Statement; import java.util.ArrayList; import java.util.List; @@ -25,13 +30,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.junit.rules.TestRule; -import org.junit.runner.Description; -import org.junit.runners.model.MultipleFailureException; -import org.junit.runners.model.Statement; - import static java.util.concurrent.locks.LockSupport.getBlocker; - import static org.junit.Assert.assertArrayEquals; public class ThreadRepository implements TestRule diff --git a/community/kernel/src/test/java/org/neo4j/test/ThreadingRule.java b/community/kernel/src/test/java/org/neo4j/test/rule/concurrent/ThreadingRule.java similarity index 97% rename from community/kernel/src/test/java/org/neo4j/test/ThreadingRule.java rename to community/kernel/src/test/java/org/neo4j/test/rule/concurrent/ThreadingRule.java index 467cf958c95ca..0f3bd0c139bfc 100644 --- a/community/kernel/src/test/java/org/neo4j/test/ThreadingRule.java +++ b/community/kernel/src/test/java/org/neo4j/test/rule/concurrent/ThreadingRule.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.test; +package org.neo4j.test.rule.concurrent; import org.junit.rules.ExternalResource; @@ -33,6 +33,8 @@ import org.neo4j.function.Predicates; import org.neo4j.function.ThrowingFunction; import org.neo4j.helpers.ConcurrentTransfer; +import org.neo4j.test.Barrier; +import org.neo4j.test.ReflectionUtil; public class ThreadingRule extends ExternalResource { diff --git a/community/kernel/src/test/java/org/neo4j/test/docs/DocsIncludeFile.java b/community/kernel/src/test/java/org/neo4j/test/rule/docs/DocsIncludeFile.java similarity index 98% rename from community/kernel/src/test/java/org/neo4j/test/docs/DocsIncludeFile.java rename to community/kernel/src/test/java/org/neo4j/test/rule/docs/DocsIncludeFile.java index 55bfb4415f3e0..d0c5f942dbe56 100644 --- a/community/kernel/src/test/java/org/neo4j/test/docs/DocsIncludeFile.java +++ b/community/kernel/src/test/java/org/neo4j/test/rule/docs/DocsIncludeFile.java @@ -17,18 +17,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.test.docs; - -import java.io.File; -import java.io.PrintWriter; +package org.neo4j.test.rule.docs; import org.junit.rules.TestRule; import org.junit.runner.Description; import org.junit.runners.model.Statement; +import java.io.File; +import java.io.PrintWriter; + import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; - import static org.neo4j.io.fs.FileUtils.path; public class DocsIncludeFile implements TestRule diff --git a/community/kernel/src/test/java/org/neo4j/qa/tooling/DumpProcessInformation.java b/community/kernel/src/test/java/org/neo4j/test/rule/dump/DumpProcessInformation.java similarity index 99% rename from community/kernel/src/test/java/org/neo4j/qa/tooling/DumpProcessInformation.java rename to community/kernel/src/test/java/org/neo4j/test/rule/dump/DumpProcessInformation.java index 604edc0dd608c..042ab9f5826d0 100644 --- a/community/kernel/src/test/java/org/neo4j/qa/tooling/DumpProcessInformation.java +++ b/community/kernel/src/test/java/org/neo4j/test/rule/dump/DumpProcessInformation.java @@ -17,7 +17,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.qa.tooling; +package org.neo4j.test.rule.dump; + +import org.hamcrest.Matcher; import java.io.BufferedReader; import java.io.File; @@ -26,7 +28,6 @@ import java.util.ArrayList; import java.util.Collection; -import org.hamcrest.Matcher; import org.neo4j.helpers.Args; import org.neo4j.helpers.collection.Pair; import org.neo4j.logging.FormattedLogProvider; diff --git a/community/kernel/src/test/java/org/neo4j/qa/tooling/DumpProcessInformationRule.java b/community/kernel/src/test/java/org/neo4j/test/rule/dump/DumpProcessInformationRule.java similarity index 98% rename from community/kernel/src/test/java/org/neo4j/qa/tooling/DumpProcessInformationRule.java rename to community/kernel/src/test/java/org/neo4j/test/rule/dump/DumpProcessInformationRule.java index 36254671e439a..3d5a775aac383 100644 --- a/community/kernel/src/test/java/org/neo4j/qa/tooling/DumpProcessInformationRule.java +++ b/community/kernel/src/test/java/org/neo4j/test/rule/dump/DumpProcessInformationRule.java @@ -17,7 +17,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.qa.tooling; +package org.neo4j.test.rule.dump; + +import org.hamcrest.Matcher; +import org.junit.rules.ExternalResource; import java.io.File; import java.io.PrintStream; @@ -27,11 +30,9 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; -import org.hamcrest.Matcher; -import org.junit.rules.ExternalResource; - import org.neo4j.logging.NullLogProvider; + public class DumpProcessInformationRule extends ExternalResource { public interface Dump diff --git a/community/kernel/src/test/java/org/neo4j/qa/tooling/DumpProcessInformationTest.java b/community/kernel/src/test/java/org/neo4j/test/rule/dump/DumpProcessInformationTest.java similarity index 98% rename from community/kernel/src/test/java/org/neo4j/qa/tooling/DumpProcessInformationTest.java rename to community/kernel/src/test/java/org/neo4j/test/rule/dump/DumpProcessInformationTest.java index 50a599bb1933c..3ebe719b00146 100644 --- a/community/kernel/src/test/java/org/neo4j/qa/tooling/DumpProcessInformationTest.java +++ b/community/kernel/src/test/java/org/neo4j/test/rule/dump/DumpProcessInformationTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.qa.tooling; +package org.neo4j.test.rule.dump; import org.junit.Rule; import org.junit.Test; @@ -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.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static java.lang.Runtime.getRuntime; import static org.hamcrest.Matchers.containsString; diff --git a/community/kernel/src/test/java/org/neo4j/qa/tooling/DumpVmInformation.java b/community/kernel/src/test/java/org/neo4j/test/rule/dump/DumpVmInformation.java similarity index 98% rename from community/kernel/src/test/java/org/neo4j/qa/tooling/DumpVmInformation.java rename to community/kernel/src/test/java/org/neo4j/test/rule/dump/DumpVmInformation.java index bed2b6765f567..c536b77d12b2f 100644 --- a/community/kernel/src/test/java/org/neo4j/qa/tooling/DumpVmInformation.java +++ b/community/kernel/src/test/java/org/neo4j/test/rule/dump/DumpVmInformation.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.qa.tooling; +package org.neo4j.test.rule.dump; import java.io.File; import java.io.IOException; diff --git a/community/kernel/src/test/java/org/neo4j/qa/tooling/DumpableProcess.java b/community/kernel/src/test/java/org/neo4j/test/rule/dump/DumpableProcess.java similarity index 97% rename from community/kernel/src/test/java/org/neo4j/qa/tooling/DumpableProcess.java rename to community/kernel/src/test/java/org/neo4j/test/rule/dump/DumpableProcess.java index d3b6bad656d44..bf89c9bcf7c3f 100644 --- a/community/kernel/src/test/java/org/neo4j/qa/tooling/DumpableProcess.java +++ b/community/kernel/src/test/java/org/neo4j/test/rule/dump/DumpableProcess.java @@ -17,13 +17,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.qa.tooling; +package org.neo4j.test.rule.dump; + +import org.junit.Ignore; import java.rmi.RemoteException; import java.rmi.server.UnicastRemoteObject; -import org.junit.Ignore; - @Ignore( "Not a test, just a helper for DumpProcessInformationTest" ) public class DumpableProcess extends UnicastRemoteObject { diff --git a/community/kernel/src/test/java/org/neo4j/test/DefaultFileSystemRule.java b/community/kernel/src/test/java/org/neo4j/test/rule/filesystem/DefaultFileSystemRule.java similarity index 89% rename from community/kernel/src/test/java/org/neo4j/test/DefaultFileSystemRule.java rename to community/kernel/src/test/java/org/neo4j/test/rule/filesystem/DefaultFileSystemRule.java index ed10bca7dcf9c..3d9359a5fa9e5 100644 --- a/community/kernel/src/test/java/org/neo4j/test/DefaultFileSystemRule.java +++ b/community/kernel/src/test/java/org/neo4j/test/rule/filesystem/DefaultFileSystemRule.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.test; +package org.neo4j.test.rule.filesystem; import org.junit.rules.ExternalResource; @@ -60,13 +60,6 @@ public void clear() public static Runnable shutdownDb( final GraphDatabaseService db ) { - return new Runnable() - { - @Override - public void run() - { - db.shutdown(); - } - }; + return () -> db.shutdown(); } } diff --git a/community/kernel/src/test/java/org/neo4j/test/EphemeralFileSystemRule.java b/community/kernel/src/test/java/org/neo4j/test/rule/filesystem/EphemeralFileSystemRule.java similarity index 97% rename from community/kernel/src/test/java/org/neo4j/test/EphemeralFileSystemRule.java rename to community/kernel/src/test/java/org/neo4j/test/rule/filesystem/EphemeralFileSystemRule.java index d75bd2597d5bd..03df64b540d10 100644 --- a/community/kernel/src/test/java/org/neo4j/test/EphemeralFileSystemRule.java +++ b/community/kernel/src/test/java/org/neo4j/test/rule/filesystem/EphemeralFileSystemRule.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.test; +package org.neo4j.test.rule.filesystem; import org.junit.rules.ExternalResource; diff --git a/community/kernel/src/test/java/org/neo4j/test/SystemExitError.java b/community/kernel/src/test/java/org/neo4j/test/rule/system/SystemExitError.java similarity index 97% rename from community/kernel/src/test/java/org/neo4j/test/SystemExitError.java rename to community/kernel/src/test/java/org/neo4j/test/rule/system/SystemExitError.java index dda87a86a32a5..6293767e7820c 100644 --- a/community/kernel/src/test/java/org/neo4j/test/SystemExitError.java +++ b/community/kernel/src/test/java/org/neo4j/test/rule/system/SystemExitError.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.test; +package org.neo4j.test.rule.system; /** * Error that used by {@link TestSecurityManager} as notification to {@link SystemExitRule} diff --git a/community/kernel/src/test/java/org/neo4j/test/SystemExitRule.java b/community/kernel/src/test/java/org/neo4j/test/rule/system/SystemExitRule.java similarity index 95% rename from community/kernel/src/test/java/org/neo4j/test/SystemExitRule.java rename to community/kernel/src/test/java/org/neo4j/test/rule/system/SystemExitRule.java index 7462a0b1ae970..8fcb07d2b9f83 100644 --- a/community/kernel/src/test/java/org/neo4j/test/SystemExitRule.java +++ b/community/kernel/src/test/java/org/neo4j/test/rule/system/SystemExitRule.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.test; +package org.neo4j.test.rule.system; import org.junit.rules.ExternalResource; import org.junit.runner.Description; @@ -31,15 +31,17 @@ public class SystemExitRule extends ExternalResource private Integer expectedExitStatusCode; private SecurityManager originalSecurityManager = null; - public static SystemExitRule none() { - return new SystemExitRule(); + private SystemExitRule() + { } - private SystemExitRule() + public static SystemExitRule none() { + return new SystemExitRule(); } - public void expectExit(int statusCode) { + public void expectExit( int statusCode ) + { this.expectedExitStatusCode = statusCode; } diff --git a/community/kernel/src/test/java/org/neo4j/test/TestSecurityManager.java b/community/kernel/src/test/java/org/neo4j/test/rule/system/TestSecurityManager.java similarity index 99% rename from community/kernel/src/test/java/org/neo4j/test/TestSecurityManager.java rename to community/kernel/src/test/java/org/neo4j/test/rule/system/TestSecurityManager.java index b613b3728d441..246cf8d8782e4 100644 --- a/community/kernel/src/test/java/org/neo4j/test/TestSecurityManager.java +++ b/community/kernel/src/test/java/org/neo4j/test/rule/system/TestSecurityManager.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.test; +package org.neo4j.test.rule.system; import java.io.FileDescriptor; import java.net.InetAddress; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/index/ParameterizedSuiteRunner.java b/community/kernel/src/test/java/org/neo4j/test/runner/ParameterizedSuiteRunner.java similarity index 99% rename from community/kernel/src/test/java/org/neo4j/kernel/api/index/ParameterizedSuiteRunner.java rename to community/kernel/src/test/java/org/neo4j/test/runner/ParameterizedSuiteRunner.java index 1d1fe3152bdef..c1cf9c0bc7b01 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/index/ParameterizedSuiteRunner.java +++ b/community/kernel/src/test/java/org/neo4j/test/runner/ParameterizedSuiteRunner.java @@ -17,7 +17,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.index; +package org.neo4j.test.runner; + +import org.junit.Test; +import org.junit.runner.Runner; +import org.junit.runners.BlockJUnit4ClassRunner; +import org.junit.runners.Suite; +import org.junit.runners.model.InitializationError; +import org.junit.runners.model.RunnerBuilder; import java.lang.reflect.Constructor; import java.lang.reflect.Method; @@ -27,13 +34,6 @@ import java.util.List; import java.util.Map; -import org.junit.Test; -import org.junit.runner.Runner; -import org.junit.runners.BlockJUnit4ClassRunner; -import org.junit.runners.Suite; -import org.junit.runners.model.InitializationError; -import org.junit.runners.model.RunnerBuilder; - public class ParameterizedSuiteRunner extends Suite { @SuppressWarnings("unused"/*used by jUnit through reflection*/) 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 7455a838eb37c..c67819a92c46c 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 @@ -97,9 +97,9 @@ import org.neo4j.logging.NullLogProvider; import org.neo4j.storageengine.api.schema.LabelScanReader; 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.Integer.parseInt; import static java.util.Collections.singletonList; @@ -120,8 +120,6 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; import static org.neo4j.graphdb.Label.label; -import static org.neo4j.graphdb.Neo4jMatchers.hasProperty; -import static org.neo4j.graphdb.Neo4jMatchers.inTx; import static org.neo4j.helpers.collection.Iterables.addToCollection; import static org.neo4j.helpers.collection.Iterables.map; import static org.neo4j.helpers.collection.Iterables.single; @@ -132,6 +130,8 @@ import static org.neo4j.helpers.collection.MapUtil.stringMap; import static org.neo4j.kernel.impl.api.index.SchemaIndexTestHelper.singleInstanceSchemaIndexProviderFactory; import static org.neo4j.kernel.impl.store.RecordStore.getRecord; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.hasProperty; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.inTx; @RunWith( Parameterized.class ) public class BatchInsertTest diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/batchinsert/BigBatchStoreIT.java b/community/kernel/src/test/java/org/neo4j/unsafe/batchinsert/BigBatchStoreIT.java index 3cfd046ad61f8..b8ed3dd249773 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/batchinsert/BigBatchStoreIT.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/batchinsert/BigBatchStoreIT.java @@ -37,8 +37,8 @@ import org.neo4j.kernel.impl.store.id.IdGeneratorImpl; import org.neo4j.kernel.impl.store.id.IdType; import org.neo4j.kernel.impl.store.id.validation.ReservedIdException; -import org.neo4j.test.EphemeralFileSystemRule; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import org.neo4j.unsafe.batchinsert.internal.BatchInserterImpl; import static java.lang.Math.pow; diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/batchinsert/internal/BatchInserterImplTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/batchinsert/internal/BatchInserterImplTest.java index e7d306bc03a88..ced02b76d21c4 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 @@ -26,13 +26,13 @@ import java.io.IOException; import org.neo4j.graphdb.factory.GraphDatabaseSettings; -import org.neo4j.io.pagecache.PageCache; import org.neo4j.io.fs.DefaultFileSystemAbstraction; +import org.neo4j.io.pagecache.PageCache; import org.neo4j.kernel.StoreLockException; -import org.neo4j.kernel.internal.StoreLocker; import org.neo4j.kernel.impl.store.NeoStores; +import org.neo4j.kernel.internal.StoreLocker; import org.neo4j.test.ReflectionUtil; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import org.neo4j.unsafe.batchinsert.BatchInserter; import org.neo4j.unsafe.batchinsert.BatchInserters; diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/ParallelizationCoordinatorTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/ParallelizationCoordinatorTest.java index e8705f0ae7c3f..2eea422689824 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/ParallelizationCoordinatorTest.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/ParallelizationCoordinatorTest.java @@ -28,7 +28,7 @@ import org.neo4j.graphdb.Resource; import org.neo4j.test.OtherThreadExecutor.WaitDetails; import org.neo4j.test.OtherThreadExecutor.WorkerCommand; -import org.neo4j.test.OtherThreadRule; +import org.neo4j.test.rule.concurrent.OtherThreadRule; public class ParallelizationCoordinatorTest { diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/PropertyEncoderStepTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/PropertyEncoderStepTest.java index c46e859984f90..f5a900641c0ab 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/PropertyEncoderStepTest.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/PropertyEncoderStepTest.java @@ -33,8 +33,8 @@ import org.neo4j.kernel.impl.store.format.lowlimit.LowLimitV3_0; import org.neo4j.kernel.impl.store.record.NodeRecord; import org.neo4j.logging.NullLogProvider; -import org.neo4j.test.EphemeralFileSystemRule; -import org.neo4j.test.PageCacheRule; +import org.neo4j.test.rule.PageCacheRule; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import org.neo4j.unsafe.impl.batchimport.input.InputNode; import org.neo4j.unsafe.impl.batchimport.staging.StageControl; import org.neo4j.unsafe.impl.batchimport.staging.Step; diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/cache/idmapping/string/EncodingIdMapperTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/cache/idmapping/string/EncodingIdMapperTest.java index 979782014f73a..c0f4321b06ef6 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/cache/idmapping/string/EncodingIdMapperTest.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/cache/idmapping/string/EncodingIdMapperTest.java @@ -40,8 +40,8 @@ import org.neo4j.graphdb.ResourceIterator; import org.neo4j.helpers.collection.PrefetchingIterator; import org.neo4j.helpers.progress.ProgressListener; -import org.neo4j.test.RandomRule; import org.neo4j.test.RepeatRule; +import org.neo4j.test.rule.RandomRule; import org.neo4j.unsafe.impl.batchimport.InputIterable; import org.neo4j.unsafe.impl.batchimport.InputIterator; import org.neo4j.unsafe.impl.batchimport.cache.NumberArrayFactory; @@ -66,7 +66,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; - import static org.neo4j.helpers.progress.ProgressListener.NONE; import static org.neo4j.unsafe.impl.batchimport.cache.idmapping.string.EncodingIdMapper.NO_MONITOR; import static org.neo4j.unsafe.impl.batchimport.input.Collectors.badCollector; diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/input/BadCollectorTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/input/BadCollectorTest.java index c7138233c4bb7..a7fc616bb5dd8 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/input/BadCollectorTest.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/input/BadCollectorTest.java @@ -29,13 +29,12 @@ import org.neo4j.collection.primitive.PrimitiveLongCollections; import org.neo4j.collection.primitive.PrimitiveLongSet; import org.neo4j.io.fs.FileSystemAbstraction; -import org.neo4j.test.EphemeralFileSystemRule; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static org.junit.Assert.assertArrayEquals; 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.input.BadCollectorTest.InputRelationshipBuilder.inputRelationship; public class BadCollectorTest 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 c96ae64238f14..73906db0f9135 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 @@ -30,10 +30,10 @@ import org.neo4j.io.ByteUnit; import org.neo4j.io.fs.DefaultFileSystemAbstraction; import org.neo4j.io.fs.FileSystemAbstraction; -import org.neo4j.test.RandomRule; import org.neo4j.test.Randoms; -import org.neo4j.test.TargetDirectory; -import org.neo4j.test.TargetDirectory.TestDirectory; +import org.neo4j.test.rule.RandomRule; +import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory.TestDirectory; import org.neo4j.unsafe.impl.batchimport.InputIterator; import static java.lang.Math.abs; 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 af629a88f292c..27864a8c3366f 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 @@ -56,9 +56,9 @@ import org.neo4j.kernel.impl.util.AutoCreatingHashMap; import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.storageengine.api.Token; -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.unsafe.impl.batchimport.BatchImporter; import org.neo4j.unsafe.impl.batchimport.Configuration; import org.neo4j.unsafe.impl.batchimport.Configuration.Default; 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 855ea236cd10b..e8dbe08969855 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 @@ -19,22 +19,22 @@ */ package org.neo4j.unsafe.impl.batchimport.input.csv; +import org.junit.Rule; +import org.junit.Test; + import java.io.StringReader; import java.util.Iterator; import java.util.Set; import java.util.function.Function; -import org.junit.Rule; -import org.junit.Test; - import org.neo4j.csv.reader.BufferedCharSeeker; import org.neo4j.csv.reader.CharSeeker; import org.neo4j.csv.reader.Extractor; import org.neo4j.csv.reader.Extractors; import org.neo4j.graphdb.ResourceIterator; import org.neo4j.helpers.collection.Iterables; -import org.neo4j.test.TargetDirectory; -import org.neo4j.test.TargetDirectory.TestDirectory; +import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory.TestDirectory; import org.neo4j.unsafe.impl.batchimport.InputIterator; import org.neo4j.unsafe.impl.batchimport.input.Collector; import org.neo4j.unsafe.impl.batchimport.input.DataException; diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/staging/LonelyProcessingStepTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/staging/LonelyProcessingStepTest.java index bd185a9fbbd39..f28a1432577d6 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/staging/LonelyProcessingStepTest.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/staging/LonelyProcessingStepTest.java @@ -26,7 +26,7 @@ import java.util.ArrayList; import java.util.List; -import org.neo4j.test.SuppressOutput; +import org.neo4j.test.rule.SuppressOutput; public class LonelyProcessingStepTest { diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/staging/MultiExecutionMonitorTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/staging/MultiExecutionMonitorTest.java index 3b5eddeddd793..7017aae4da805 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/staging/MultiExecutionMonitorTest.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/staging/MultiExecutionMonitorTest.java @@ -27,16 +27,18 @@ import org.neo4j.helpers.Clock; import org.neo4j.helpers.FakeClock; -import org.neo4j.test.CleanupRule; +import org.neo4j.test.rule.CleanupRule; +import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.hamcrest.Matchers.lessThanOrEqualTo; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; -import static java.util.concurrent.TimeUnit.MILLISECONDS; - public class MultiExecutionMonitorTest { + @Rule + public final CleanupRule cleanup = new CleanupRule(); + @Test public void shouldCheckMultipleMonitors() throws Exception { @@ -70,8 +72,6 @@ private void expectCallsToCheck( ExecutionMonitor multiMonitor, Object... altern } } - public final @Rule CleanupRule cleanup = new CleanupRule(); - private static class TestableMonitor extends ExecutionMonitor.Adapter { private int timesPolled; diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/staging/ProcessorStepTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/staging/ProcessorStepTest.java index bf7d8241c073a..36ebee61a4405 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/staging/ProcessorStepTest.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/staging/ProcessorStepTest.java @@ -28,11 +28,11 @@ import org.neo4j.graphdb.Resource; import org.neo4j.test.OtherThreadExecutor.WorkerCommand; -import org.neo4j.test.OtherThreadRule; +import org.neo4j.test.rule.concurrent.OtherThreadRule; + import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verifyNoMoreInteractions; - import static org.neo4j.unsafe.impl.batchimport.staging.Step.ORDER_PROCESS; public class ProcessorStepTest diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/store/BatchingNeoStoresTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/store/BatchingNeoStoresTest.java index ee5b34153d648..3718afab7d070 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/store/BatchingNeoStoresTest.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/store/BatchingNeoStoresTest.java @@ -31,15 +31,14 @@ import org.neo4j.kernel.impl.MyRelTypes; import org.neo4j.kernel.impl.logging.NullLogService; import org.neo4j.kernel.impl.store.format.lowlimit.LowLimitV3_0; -import org.neo4j.test.EphemeralFileSystemRule; -import org.neo4j.test.PageCacheRule; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.PageCacheRule; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static org.hamcrest.CoreMatchers.containsString; 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.io.ByteUnit.kibiBytes; import static org.neo4j.io.ByteUnit.mebiBytes; diff --git a/community/lucene-index/src/test/java/examples/ImdbDocTest.java b/community/lucene-index/src/test/java/examples/ImdbDocTest.java index eb3e8ad734625..e1e123d34f10f 100644 --- a/community/lucene-index/src/test/java/examples/ImdbDocTest.java +++ b/community/lucene-index/src/test/java/examples/ImdbDocTest.java @@ -67,8 +67,8 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -import static org.neo4j.graphdb.Neo4jMatchers.hasProperty; -import static org.neo4j.graphdb.Neo4jMatchers.inTx; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.hasProperty; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.inTx; public class ImdbDocTest { diff --git a/community/lucene-index/src/test/java/org/neo4j/concurrencytest/ConstraintIndexConcurrencyTest.java b/community/lucene-index/src/test/java/org/neo4j/concurrencytest/ConstraintIndexConcurrencyTest.java index 207ad2b24132e..636e3d7f87d49 100644 --- a/community/lucene-index/src/test/java/org/neo4j/concurrencytest/ConstraintIndexConcurrencyTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/concurrencytest/ConstraintIndexConcurrencyTest.java @@ -26,14 +26,14 @@ import org.neo4j.graphdb.Label; import org.neo4j.graphdb.Transaction; -import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.exceptions.schema.UniquePropertyConstraintViolationKernelException; import org.neo4j.kernel.api.index.IndexDescriptor; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; -import org.neo4j.test.DatabaseRule; -import org.neo4j.test.ImpermanentDatabaseRule; -import org.neo4j.test.ThreadingRule; +import org.neo4j.kernel.internal.GraphDatabaseAPI; +import org.neo4j.test.rule.DatabaseRule; +import org.neo4j.test.rule.ImpermanentDatabaseRule; +import org.neo4j.test.rule.concurrent.ThreadingRule; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; diff --git a/community/lucene-index/src/test/java/org/neo4j/concurrencytest/LegacyIndexAddDropConcurrently.java b/community/lucene-index/src/test/java/org/neo4j/concurrencytest/LegacyIndexAddDropConcurrently.java index 0d3650a39409e..761477752f8ac 100644 --- a/community/lucene-index/src/test/java/org/neo4j/concurrencytest/LegacyIndexAddDropConcurrently.java +++ b/community/lucene-index/src/test/java/org/neo4j/concurrencytest/LegacyIndexAddDropConcurrently.java @@ -19,6 +19,9 @@ */ package org.neo4j.concurrencytest; +import org.junit.Rule; +import org.junit.Test; + import java.util.ArrayList; import java.util.List; import java.util.Random; @@ -28,13 +31,10 @@ import java.util.concurrent.Future; import java.util.concurrent.ThreadLocalRandom; -import org.junit.Rule; -import org.junit.Test; - import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.NotFoundException; import org.neo4j.graphdb.Transaction; -import org.neo4j.test.ImpermanentDatabaseRule; +import org.neo4j.test.rule.ImpermanentDatabaseRule; public class LegacyIndexAddDropConcurrently { diff --git a/community/lucene-index/src/test/java/org/neo4j/graphdb/LuceneLabelScanStoreChaosIT.java b/community/lucene-index/src/test/java/org/neo4j/graphdb/LuceneLabelScanStoreChaosIT.java index a04029c0f00c3..82e61c2420244 100644 --- a/community/lucene-index/src/test/java/org/neo4j/graphdb/LuceneLabelScanStoreChaosIT.java +++ b/community/lucene-index/src/test/java/org/neo4j/graphdb/LuceneLabelScanStoreChaosIT.java @@ -34,9 +34,8 @@ import java.util.stream.Stream; import org.neo4j.kernel.api.impl.labelscan.LuceneLabelScanIndexBuilder; -import org.neo4j.test.DatabaseRule; -import org.neo4j.test.DatabaseRule.RestartAction; -import org.neo4j.test.EmbeddedDatabaseRule; +import org.neo4j.test.rule.DatabaseRule; +import org.neo4j.test.rule.EmbeddedDatabaseRule; import static java.util.stream.Collectors.toList; import static org.junit.Assert.assertEquals; @@ -80,7 +79,7 @@ public void rebuildCorruptedLabelScanStoreToStartup() throws Exception assertEquals( asSet( node ), getAllNodesWithLabel( Labels.First ) ); } - private RestartAction corruptTheLabelScanStoreIndex() + private DatabaseRule.RestartAction corruptTheLabelScanStoreIndex() { return ( fs, storeDirectory ) -> { try @@ -104,7 +103,7 @@ private RestartAction corruptTheLabelScanStoreIndex() }; } - private RestartAction deleteTheLabelScanStoreIndex() + private DatabaseRule.RestartAction deleteTheLabelScanStoreIndex() { return ( fs, storeDirectory ) -> { try diff --git a/community/lucene-index/src/test/java/org/neo4j/graphdb/MandatoryTransactionsForIndexHitsFacadeTests.java b/community/lucene-index/src/test/java/org/neo4j/graphdb/MandatoryTransactionsForIndexHitsFacadeTests.java index 45444a975119b..c40a8bbef31b2 100644 --- a/community/lucene-index/src/test/java/org/neo4j/graphdb/MandatoryTransactionsForIndexHitsFacadeTests.java +++ b/community/lucene-index/src/test/java/org/neo4j/graphdb/MandatoryTransactionsForIndexHitsFacadeTests.java @@ -25,7 +25,7 @@ import org.neo4j.graphdb.index.Index; import org.neo4j.graphdb.index.IndexHits; -import org.neo4j.test.ImpermanentDatabaseRule; +import org.neo4j.test.rule.ImpermanentDatabaseRule; import static org.junit.Assert.fail; diff --git a/community/lucene-index/src/test/java/org/neo4j/index/LegacyIndexTest.java b/community/lucene-index/src/test/java/org/neo4j/index/LegacyIndexTest.java index 740262d232981..ec87df5953f40 100644 --- a/community/lucene-index/src/test/java/org/neo4j/index/LegacyIndexTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/index/LegacyIndexTest.java @@ -29,8 +29,8 @@ import org.neo4j.graphdb.RelationshipType; import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.index.Index; -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.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/AutoIndexOperationsTest.java b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/AutoIndexOperationsTest.java index ff3fcafc6a368..ad4733a4ea13b 100644 --- a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/AutoIndexOperationsTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/AutoIndexOperationsTest.java @@ -31,8 +31,8 @@ import org.neo4j.graphdb.index.IndexHits; import org.neo4j.graphdb.index.ReadableRelationshipIndex; import org.neo4j.kernel.impl.MyRelTypes; -import org.neo4j.test.DatabaseRule; -import org.neo4j.test.EmbeddedDatabaseRule; +import org.neo4j.test.rule.DatabaseRule; +import org.neo4j.test.rule.EmbeddedDatabaseRule; import static org.junit.Assert.assertEquals; import static org.neo4j.helpers.collection.Iterators.count; diff --git a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/BatchInsertionIT.java b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/BatchInsertionIT.java index 42cbad504d4fd..ffae1ffb3a94d 100644 --- a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/BatchInsertionIT.java +++ b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/BatchInsertionIT.java @@ -31,7 +31,7 @@ import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Transaction; import org.neo4j.index.lucene.unsafe.batchinsert.LuceneBatchInserterIndexProvider; -import org.neo4j.test.EmbeddedDatabaseRule; +import org.neo4j.test.rule.EmbeddedDatabaseRule; import org.neo4j.unsafe.batchinsert.BatchInserter; import org.neo4j.unsafe.batchinsert.BatchInserterIndex; import org.neo4j.unsafe.batchinsert.BatchInserterIndexProvider; 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 3bfa1bd811cfc..324651ddedd8e 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 @@ -53,8 +53,8 @@ import org.neo4j.kernel.impl.transaction.log.rotation.LogRotation; import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.storageengine.api.StorageCommand; -import org.neo4j.test.TargetDirectory; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.TargetDirectory; import static java.util.concurrent.Executors.newCachedThreadPool; import static org.junit.Assert.assertEquals; diff --git a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/LuceneCommandApplierTest.java b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/LuceneCommandApplierTest.java index a3a4eb07ac329..17abfe907e918 100644 --- a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/LuceneCommandApplierTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/LuceneCommandApplierTest.java @@ -26,20 +26,19 @@ import java.util.Map; import org.neo4j.graphdb.Node; -import org.neo4j.kernel.configuration.Settings; import org.neo4j.helpers.collection.MapUtil; import org.neo4j.kernel.configuration.Config; +import org.neo4j.kernel.configuration.Settings; import org.neo4j.kernel.impl.index.IndexCommand.AddNodeCommand; import org.neo4j.kernel.impl.index.IndexConfigStore; import org.neo4j.kernel.impl.index.IndexDefineCommand; import org.neo4j.kernel.lifecycle.LifeRule; -import org.neo4j.test.EphemeralFileSystemRule; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static org.mockito.Matchers.any; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; - import static org.neo4j.helpers.collection.MapUtil.stringMap; import static org.neo4j.index.impl.lucene.legacy.LuceneIndexImplementation.EXACT_CONFIG; 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 a0f09daa93702..9dd783384e95f 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 @@ -36,8 +36,8 @@ import org.neo4j.kernel.impl.index.IndexConfigStore; import org.neo4j.kernel.impl.index.IndexEntityType; import org.neo4j.kernel.lifecycle.LifeRule; -import org.neo4j.test.TargetDirectory; -import org.neo4j.test.TargetDirectory.TestDirectory; +import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory.TestDirectory; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotSame; 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 717a45e6d11d5..da126e34f068b 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 @@ -50,7 +50,7 @@ import org.neo4j.kernel.impl.util.Neo4jJobScheduler; import org.neo4j.logging.LogProvider; import org.neo4j.storageengine.api.schema.IndexReader; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static java.util.Collections.singletonList; import static org.hamcrest.CoreMatchers.equalTo; diff --git a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/PerformanceAndSanityIT.java b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/PerformanceAndSanityIT.java index 0afb7cc613d41..3eb03b1c687d0 100644 --- a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/PerformanceAndSanityIT.java +++ b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/PerformanceAndSanityIT.java @@ -44,8 +44,8 @@ import org.neo4j.helpers.collection.Iterables; import org.neo4j.helpers.collection.Iterators; import org.neo4j.index.lucene.QueryContext; -import org.neo4j.test.TargetDirectory; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.TargetDirectory; import static java.lang.System.currentTimeMillis; import static java.lang.System.out; diff --git a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/RecoveryTest.java b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/RecoveryTest.java index defc0ae0ea742..d67e917adff11 100644 --- a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/RecoveryTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/RecoveryTest.java @@ -32,12 +32,12 @@ import org.neo4j.graphdb.factory.GraphDatabaseSettings; import org.neo4j.graphdb.index.Index; import org.neo4j.helpers.collection.MapUtil; -import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.fs.DefaultFileSystemAbstraction; +import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.index.IndexConfigStore; -import org.neo4j.test.DatabaseRule; -import org.neo4j.test.EmbeddedDatabaseRule; +import org.neo4j.test.rule.DatabaseRule; +import org.neo4j.test.rule.EmbeddedDatabaseRule; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; 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 bdda5aa467bf5..7e05f01dbd621 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 @@ -31,15 +31,15 @@ import org.neo4j.kernel.api.exceptions.schema.UnableToValidateConstraintKernelException; import org.neo4j.kernel.api.impl.index.builder.LuceneIndexStorageBuilder; import org.neo4j.kernel.api.impl.index.storage.PartitionedIndexStorage; -import org.neo4j.test.TargetDirectory; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.TargetDirectory; 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.TargetDirectory.testDirForTest; +import static org.neo4j.test.rule.TargetDirectory.testDirForTest; public class ConstraintIndexFailureIT { 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 d4f04dfcf577a..30d9f6463a896 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 @@ -39,7 +39,6 @@ import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.schema.ConstraintDefinition; import org.neo4j.io.fs.FileUtils; -import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.io.pagecache.IOLimiter; import org.neo4j.kernel.api.impl.labelscan.LuceneLabelScanStoreExtension; import org.neo4j.kernel.api.impl.schema.LuceneSchemaIndexProviderFactory; @@ -48,9 +47,10 @@ 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.kernel.internal.GraphDatabaseAPI; import org.neo4j.storageengine.api.StorageEngine; -import org.neo4j.test.TargetDirectory; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.TargetDirectory; import static java.util.Arrays.asList; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/AbstractLuceneIndexIntegrationTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/AbstractLuceneIndexIntegrationTest.java index 32ee2ebfd3656..7ee6d31700da9 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/AbstractLuceneIndexIntegrationTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/AbstractLuceneIndexIntegrationTest.java @@ -52,7 +52,7 @@ 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.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndexPopulationIT.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndexPopulationIT.java index fc680182e4bd1..55e05b838df87 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.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndexUniquenessVerificationIT.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndexUniquenessVerificationIT.java index b9bba549874fb..d990d4c83d320 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.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static java.util.stream.Collectors.toSet; import static org.hamcrest.Matchers.instanceOf; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/backup/LuceneIndexSnapshotFileIteratorTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/backup/LuceneIndexSnapshotFileIteratorTest.java index c1559380b9146..e5e3abdb25423 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/backup/LuceneIndexSnapshotFileIteratorTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/backup/LuceneIndexSnapshotFileIteratorTest.java @@ -39,7 +39,7 @@ import org.neo4j.helpers.collection.Iterators; import org.neo4j.io.IOUtils; import org.neo4j.kernel.api.impl.index.IndexWriterConfigs; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static java.util.stream.Collectors.toSet; import static junit.framework.TestCase.assertFalse; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/storage/FailureStorageTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/storage/FailureStorageTest.java index 0345f622684dc..091f0e3e5752e 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/storage/FailureStorageTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/storage/FailureStorageTest.java @@ -26,7 +26,7 @@ import java.io.File; import org.neo4j.kernel.api.impl.index.storage.layout.IndexFolderLayout; -import org.neo4j.test.EphemeralFileSystemRule; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static java.lang.String.format; import static org.junit.Assert.assertEquals; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/storage/PartitionedIndexStorageTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/storage/PartitionedIndexStorageTest.java index 28a1a1f062c9a..54e8204e2e319 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,8 +43,8 @@ import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.fs.StoreChannel; import org.neo4j.kernel.api.impl.index.IndexWriterConfigs; -import org.neo4j.test.DefaultFileSystemRule; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.filesystem.DefaultFileSystemRule; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/verification/SimpleUniquenessVerifierTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/verification/SimpleUniquenessVerifierTest.java index abfa4d1fa29de..9578835a17e2a 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.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static java.util.Arrays.asList; import static org.hamcrest.Matchers.instanceOf; 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 c056bacc2580a..ef4537911c8ee 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.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static org.junit.Assert.assertEquals; 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 b39f17ef31d1a..58a2a98f3fdee 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 @@ -58,7 +58,7 @@ import org.neo4j.kernel.lifecycle.LifeSupport; import org.neo4j.logging.NullLogProvider; import org.neo4j.storageengine.api.schema.LabelScanReader; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static java.util.Arrays.asList; import static java.util.Collections.emptyList; 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 eb500d8b6d110..b78efab60238c 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.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static java.lang.Long.parseLong; import static java.lang.String.valueOf; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexAccessorTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexAccessorTest.java index 9c8a7ad8ac3ea..c679a1c846193 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexAccessorTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexAccessorTest.java @@ -46,7 +46,7 @@ import org.neo4j.kernel.impl.api.index.IndexUpdateMode; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.storageengine.api.schema.IndexSampler; -import org.neo4j.test.ThreadingRule; +import org.neo4j.test.rule.concurrent.ThreadingRule; import static java.util.Arrays.asList; import static java.util.concurrent.TimeUnit.SECONDS; @@ -55,7 +55,7 @@ import static org.junit.Assert.fail; import static org.neo4j.helpers.collection.Iterators.asSet; import static org.neo4j.helpers.collection.Iterators.emptySetOf; -import static org.neo4j.test.ThreadingRule.waitingWhileIn; +import static org.neo4j.test.rule.concurrent.ThreadingRule.waitingWhileIn; @RunWith( Parameterized.class ) public class LuceneIndexAccessorTest diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexRecoveryIT.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexRecoveryIT.java index eb0ae5524cfe5..cc5d661f258dc 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexRecoveryIT.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexRecoveryIT.java @@ -44,8 +44,8 @@ import org.neo4j.kernel.impl.transaction.log.rotation.LogRotation; import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.lifecycle.Lifecycle; -import org.neo4j.test.EphemeralFileSystemRule; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexCorruptionTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexCorruptionTest.java index 97d5603e0f863..f808353418cbb 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,8 +33,8 @@ 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.EphemeralFileSystemRule; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static java.util.Collections.singletonList; import static org.hamcrest.Matchers.instanceOf; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexIT.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexIT.java index 66221bee6f4bd..d2fd1585c00b1 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.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static org.hamcrest.core.IsEqual.equalTo; import static org.junit.Assert.assertEquals; 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 c11620341a1fc..39dce79437d81 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 @@ -48,8 +48,8 @@ import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.index.IndexStoreView; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; -import org.neo4j.test.DefaultFileSystemRule; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.filesystem.DefaultFileSystemRule; import static java.lang.Long.parseLong; import static java.util.Arrays.asList; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexTest.java index e3c555a89b1e9..419343faeacae 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,8 +31,8 @@ import org.neo4j.io.IOUtils; import org.neo4j.kernel.api.impl.index.storage.DirectoryFactory; -import org.neo4j.test.DefaultFileSystemRule; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.filesystem.DefaultFileSystemRule; import static org.junit.Assert.assertTrue; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/SchemaIndexAcceptanceTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/SchemaIndexAcceptanceTest.java index 7554e48842311..b05f0b79d8339 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/SchemaIndexAcceptanceTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/SchemaIndexAcceptanceTest.java @@ -33,21 +33,21 @@ import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.schema.IndexDefinition; import org.neo4j.graphdb.schema.Schema.IndexState; -import org.neo4j.test.EphemeralFileSystemRule; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static org.junit.Assert.assertThat; import static org.neo4j.graphdb.Label.label; -import static org.neo4j.graphdb.Neo4jMatchers.containsOnly; -import static org.neo4j.graphdb.Neo4jMatchers.createIndex; -import static org.neo4j.graphdb.Neo4jMatchers.findNodesByLabelAndProperty; -import static org.neo4j.graphdb.Neo4jMatchers.getIndexes; -import static org.neo4j.graphdb.Neo4jMatchers.haveState; -import static org.neo4j.graphdb.Neo4jMatchers.inTx; -import static org.neo4j.graphdb.Neo4jMatchers.isEmpty; import static org.neo4j.helpers.collection.Iterables.count; import static org.neo4j.helpers.collection.Iterators.loop; import static org.neo4j.helpers.collection.MapUtil.map; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.containsOnly; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.createIndex; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.findNodesByLabelAndProperty; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.getIndexes; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.haveState; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.inTx; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.isEmpty; public class SchemaIndexAcceptanceTest { diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/UniqueIndexApplicationIT.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/UniqueIndexApplicationIT.java index e658b18c36d63..59d5897e8381c 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/UniqueIndexApplicationIT.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/UniqueIndexApplicationIT.java @@ -36,8 +36,8 @@ import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Label; import org.neo4j.graphdb.Node; -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.Arrays.asList; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/populator/NonUniqueLuceneIndexPopulatorTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/populator/NonUniqueLuceneIndexPopulatorTest.java index 9bb5c65e81c35..9994bffd338d8 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/populator/NonUniqueLuceneIndexPopulatorTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/populator/NonUniqueLuceneIndexPopulatorTest.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.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/populator/UniqueLuceneIndexPopulatorTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/populator/UniqueLuceneIndexPopulatorTest.java index 5b52d84ec33cc..16e7a881c6878 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/populator/UniqueLuceneIndexPopulatorTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/populator/UniqueLuceneIndexPopulatorTest.java @@ -46,10 +46,10 @@ import org.neo4j.kernel.api.index.PropertyAccessor; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.storageengine.api.schema.IndexSample; -import org.neo4j.test.CleanupRule; import org.neo4j.test.OtherThreadExecutor; import org.neo4j.test.OtherThreadExecutor.WorkerCommand; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.CleanupRule; +import org.neo4j.test.rule.TargetDirectory; import static java.util.Arrays.asList; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintCreationIT.java b/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintCreationIT.java index f82f7ff5501dc..9643bcc495c27 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintCreationIT.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintCreationIT.java @@ -29,10 +29,10 @@ import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; import org.neo4j.helpers.collection.Iterables; -import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.api.impl.index.storage.layout.IndexFolderLayout; import org.neo4j.kernel.api.index.SchemaIndexProvider; -import org.neo4j.test.EmbeddedDatabaseRule; +import org.neo4j.kernel.internal.GraphDatabaseAPI; +import org.neo4j.test.rule.EmbeddedDatabaseRule; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintRecoveryIT.java b/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintRecoveryIT.java index 4e136660de1ee..42bde83248581 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintRecoveryIT.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintRecoveryIT.java @@ -37,8 +37,8 @@ import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageEngine; import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.monitoring.Monitors; -import org.neo4j.test.EphemeralFileSystemRule; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceIntegrationTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceIntegrationTest.java index e8eef2fe0fff0..18bdac15c8161 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceIntegrationTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceIntegrationTest.java @@ -32,7 +32,6 @@ import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction; -import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; import org.neo4j.kernel.api.impl.schema.LuceneSchemaIndexProviderFactory; import org.neo4j.kernel.api.index.IndexDescriptor; @@ -44,9 +43,10 @@ import org.neo4j.kernel.impl.store.NeoStores; import org.neo4j.kernel.impl.store.SchemaStore; import org.neo4j.kernel.impl.store.record.IndexRule; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.storageengine.api.schema.PopulationProgress; -import org.neo4j.test.EphemeralFileSystemRule; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static org.junit.Assert.assertEquals; 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 92367ed65a1ef..9ee28b5c8b4e4 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 @@ -53,8 +53,8 @@ import org.neo4j.kernel.extension.KernelExtensionFactory; import org.neo4j.kernel.impl.api.index.inmemory.InMemoryIndexProviderFactory; import org.neo4j.kernel.impl.api.scan.InMemoryLabelScanStoreExtension; -import org.neo4j.test.TargetDirectory; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.TargetDirectory; import static org.apache.lucene.search.NumericRangeQuery.newIntRange; import static org.hamcrest.core.Is.is; 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 acea425f8994a..c0d9a1279b744 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 @@ -35,8 +35,8 @@ import org.neo4j.kernel.api.index.SchemaIndexProvider; import org.neo4j.kernel.extension.dependency.HighestSelectionStrategy; import org.neo4j.kernel.internal.GraphDatabaseAPI; -import org.neo4j.test.TargetDirectory; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.TargetDirectory; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; 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 78264476bcb53..8fff0d60c814e 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,8 +31,8 @@ import org.neo4j.io.fs.FileUtils; import org.neo4j.server.ServerTestUtils; import org.neo4j.server.configuration.ServerSettings; -import org.neo4j.test.SuppressOutput; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.SuppressOutput; +import org.neo4j.test.rule.TargetDirectory; import org.neo4j.test.server.HTTP; import static junit.framework.TestCase.fail; 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 cf8ef8aa85ea4..cb73be45810dc 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 @@ -19,6 +19,11 @@ */ package org.neo4j.harness; +import org.apache.commons.io.FileUtils; +import org.codehaus.jackson.JsonNode; +import org.junit.Rule; +import org.junit.Test; + import java.io.File; import java.io.IOException; import java.net.URI; @@ -36,11 +41,6 @@ import javax.net.ssl.TrustManager; import javax.net.ssl.X509TrustManager; -import org.apache.commons.io.FileUtils; -import org.codehaus.jackson.JsonNode; -import org.junit.Rule; -import org.junit.Test; - import org.neo4j.bolt.v1.transport.socket.client.SocketConnection; import org.neo4j.dbms.DatabaseManagementSystemSettings; import org.neo4j.graphdb.GraphDatabaseService; @@ -55,9 +55,9 @@ import org.neo4j.server.ServerTestUtils; import org.neo4j.server.configuration.ServerSettings; import org.neo4j.server.rest.domain.JsonParseException; -import org.neo4j.test.SuppressOutput; -import org.neo4j.test.TargetDirectory; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.SuppressOutput; +import org.neo4j.test.rule.TargetDirectory; import org.neo4j.test.server.HTTP; import static org.hamcrest.CoreMatchers.equalTo; @@ -67,7 +67,6 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; - import static org.neo4j.harness.TestServerBuilders.newInProcessBuilder; import static org.neo4j.helpers.collection.MapUtil.stringMap; import static org.neo4j.server.configuration.ServerSettings.httpConnector; 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 d5f6b0ab84675..a9a22b7fe526a 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 @@ -19,12 +19,12 @@ */ package org.neo4j.harness; -import java.util.List; - import org.junit.Rule; import org.junit.Test; import org.junit.runners.model.Statement; +import java.util.List; + import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Label; import org.neo4j.graphdb.Result; @@ -34,17 +34,16 @@ import org.neo4j.harness.junit.Neo4jRule; import org.neo4j.helpers.collection.Iterators; import org.neo4j.server.configuration.ServerSettings; -import org.neo4j.test.SuppressOutput; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.SuppressOutput; +import org.neo4j.test.rule.TargetDirectory; import org.neo4j.test.server.HTTP; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; 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.TargetDirectory.testDirForTest; +import static org.neo4j.test.rule.TargetDirectory.testDirForTest; import static org.neo4j.test.server.HTTP.RawPayload.quotedJson; public class JUnitRuleTest 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 494abf281af27..5528261a0ec3c 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 @@ -32,8 +32,8 @@ import org.neo4j.kernel.lifecycle.LifecycleAdapter; import org.neo4j.procedure.Context; import org.neo4j.procedure.Procedure; -import org.neo4j.test.SuppressOutput; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.SuppressOutput; +import org.neo4j.test.rule.TargetDirectory; import org.neo4j.test.server.HTTP; import static junit.framework.TestCase.assertEquals; diff --git a/community/neo4j/src/test/java/ConcurrentChangesOnEntitiesTest.java b/community/neo4j/src/test/java/ConcurrentChangesOnEntitiesTest.java index 4d4b94b4f0c01..adc89aafbd5d9 100644 --- a/community/neo4j/src/test/java/ConcurrentChangesOnEntitiesTest.java +++ b/community/neo4j/src/test/java/ConcurrentChangesOnEntitiesTest.java @@ -41,7 +41,7 @@ import org.neo4j.kernel.configuration.Config; import org.neo4j.logging.FormattedLogProvider; import org.neo4j.logging.LogProvider; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; diff --git a/community/neo4j/src/test/java/counts/RebuildCountsTest.java b/community/neo4j/src/test/java/counts/RebuildCountsTest.java index da1b6b120e98f..07b23ce64f07b 100644 --- a/community/neo4j/src/test/java/counts/RebuildCountsTest.java +++ b/community/neo4j/src/test/java/counts/RebuildCountsTest.java @@ -33,7 +33,6 @@ import org.neo4j.graphdb.ResourceIterator; import org.neo4j.graphdb.Transaction; import org.neo4j.io.fs.FileSystemAbstraction; -import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.impl.api.index.inmemory.InMemoryIndexProvider; import org.neo4j.kernel.impl.api.index.inmemory.InMemoryIndexProviderFactory; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; @@ -43,9 +42,10 @@ import org.neo4j.kernel.impl.store.counts.CountsTracker; import org.neo4j.kernel.impl.transaction.log.checkpoint.CheckPointer; import org.neo4j.kernel.impl.transaction.log.checkpoint.SimpleTriggerInfo; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.logging.AssertableLogProvider; -import org.neo4j.test.EphemeralFileSystemRule; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/community/neo4j/src/test/java/db/DatabaseStartupTest.java b/community/neo4j/src/test/java/db/DatabaseStartupTest.java index 918395198169c..355454a4b87d7 100644 --- a/community/neo4j/src/test/java/db/DatabaseStartupTest.java +++ b/community/neo4j/src/test/java/db/DatabaseStartupTest.java @@ -34,8 +34,8 @@ import org.neo4j.kernel.impl.storemigration.StoreUpgrader; import org.neo4j.kernel.impl.storemigration.UpgradeNotAllowedByConfigurationException; import org.neo4j.kernel.lifecycle.LifecycleException; -import org.neo4j.test.TargetDirectory; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.TargetDirectory; import static org.hamcrest.Matchers.containsString; import static org.junit.Assert.assertEquals; diff --git a/community/neo4j/src/test/java/files/TestNoFileDescriptorLeaks.java b/community/neo4j/src/test/java/files/TestNoFileDescriptorLeaks.java index dbe370c0d941d..31968b3046174 100644 --- a/community/neo4j/src/test/java/files/TestNoFileDescriptorLeaks.java +++ b/community/neo4j/src/test/java/files/TestNoFileDescriptorLeaks.java @@ -29,7 +29,7 @@ import org.neo4j.graphdb.Transaction; import org.neo4j.kernel.impl.util.OsBeanUtil; -import org.neo4j.test.EmbeddedDatabaseRule; +import org.neo4j.test.rule.EmbeddedDatabaseRule; import static org.hamcrest.Matchers.lessThan; import static org.hamcrest.Matchers.not; 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 b47960d7ca701..cfa1dbb4937b4 100644 --- a/community/neo4j/src/test/java/org/neo4j/index/IndexSamplingIntegrationTest.java +++ b/community/neo4j/src/test/java/org/neo4j/index/IndexSamplingIntegrationTest.java @@ -30,17 +30,17 @@ import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.schema.IndexDefinition; import org.neo4j.io.fs.FileUtils; -import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageEngine; import org.neo4j.kernel.impl.store.MetaDataStore; import org.neo4j.kernel.impl.store.StoreFactory; 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.register.Register.DoubleLongRegister; import org.neo4j.register.Registers; -import org.neo4j.test.TargetDirectory; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.TargetDirectory; import static org.junit.Assert.assertEquals; diff --git a/community/neo4j/src/test/java/org/neo4j/index/IndexTxStateLookupTest.java b/community/neo4j/src/test/java/org/neo4j/index/IndexTxStateLookupTest.java index a4eb3e520b5be..b4ab93389a0c9 100644 --- a/community/neo4j/src/test/java/org/neo4j/index/IndexTxStateLookupTest.java +++ b/community/neo4j/src/test/java/org/neo4j/index/IndexTxStateLookupTest.java @@ -32,8 +32,8 @@ import org.neo4j.graphdb.GraphDatabaseService; 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 static java.util.Arrays.asList; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/community/neo4j/src/test/java/recovery/CountsStoreRecoveryTest.java b/community/neo4j/src/test/java/recovery/CountsStoreRecoveryTest.java index 3c6f753c499fd..8692e0189a2cc 100644 --- a/community/neo4j/src/test/java/recovery/CountsStoreRecoveryTest.java +++ b/community/neo4j/src/test/java/recovery/CountsStoreRecoveryTest.java @@ -30,22 +30,22 @@ import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Transaction; import org.neo4j.io.fs.FileSystemAbstraction; -import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.impl.api.CountsVisitor; import org.neo4j.kernel.impl.api.index.inmemory.InMemoryIndexProvider; import org.neo4j.kernel.impl.api.index.inmemory.InMemoryIndexProviderFactory; import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageEngine; -import org.neo4j.kernel.impl.store.NeoStores; import org.neo4j.kernel.impl.store.MetaDataStore; +import org.neo4j.kernel.impl.store.NeoStores; import org.neo4j.kernel.impl.store.counts.CountsTracker; import org.neo4j.kernel.impl.transaction.log.checkpoint.CheckPointer; import org.neo4j.kernel.impl.transaction.log.checkpoint.SimpleTriggerInfo; -import org.neo4j.test.EphemeralFileSystemRule; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static org.junit.Assert.assertEquals; 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 CountsStoreRecoveryTest { diff --git a/community/neo4j/src/test/java/recovery/TestRecoveryMultipleDataSources.java b/community/neo4j/src/test/java/recovery/TestRecoveryMultipleDataSources.java index 4ccca736e1ed2..9adb1b7b8f250 100644 --- a/community/neo4j/src/test/java/recovery/TestRecoveryMultipleDataSources.java +++ b/community/neo4j/src/test/java/recovery/TestRecoveryMultipleDataSources.java @@ -32,8 +32,8 @@ import org.neo4j.kernel.impl.transaction.log.checkpoint.CheckPointer; import org.neo4j.kernel.impl.transaction.log.checkpoint.SimpleTriggerInfo; import org.neo4j.kernel.internal.GraphDatabaseAPI; -import org.neo4j.test.TargetDirectory; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.TargetDirectory; import static java.lang.Runtime.getRuntime; import static java.lang.System.exit; diff --git a/community/neo4j/src/test/java/recovery/TestRecoveryScenarios.java b/community/neo4j/src/test/java/recovery/TestRecoveryScenarios.java index 736bb5cef4e81..0a4f12ed63d7f 100644 --- a/community/neo4j/src/test/java/recovery/TestRecoveryScenarios.java +++ b/community/neo4j/src/test/java/recovery/TestRecoveryScenarios.java @@ -48,15 +48,15 @@ import org.neo4j.kernel.impl.transaction.log.checkpoint.SimpleTriggerInfo; import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.storageengine.api.StorageEngine; -import org.neo4j.test.EphemeralFileSystemRule; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static java.util.concurrent.TimeUnit.SECONDS; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; import static org.neo4j.graphdb.Label.label; import static org.neo4j.register.Registers.newDoubleLongRegister; -import static org.neo4j.test.EphemeralFileSystemRule.shutdownDbAction; +import static org.neo4j.test.rule.filesystem.EphemeralFileSystemRule.shutdownDbAction; /** diff --git a/community/neo4j/src/test/java/recovery/UniquenessRecoveryTest.java b/community/neo4j/src/test/java/recovery/UniquenessRecoveryTest.java index 043b74bc62390..c96a290a8958d 100644 --- a/community/neo4j/src/test/java/recovery/UniquenessRecoveryTest.java +++ b/community/neo4j/src/test/java/recovery/UniquenessRecoveryTest.java @@ -47,16 +47,16 @@ import org.neo4j.helpers.collection.Iterables; import org.neo4j.io.pagecache.PageCache; import org.neo4j.kernel.internal.GraphDatabaseAPI; -import org.neo4j.test.SuppressOutput; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.SuppressOutput; +import org.neo4j.test.rule.TargetDirectory; 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.SuppressOutput.suppress; -import static org.neo4j.test.TargetDirectory.testDirForTest; +import static org.neo4j.test.rule.SuppressOutput.suppress; +import static org.neo4j.test.rule.TargetDirectory.testDirForTest; @RunWith( Parameterized.class ) public class UniquenessRecoveryTest diff --git a/community/neo4j/src/test/java/schema/IndexPopulationFlipRaceIT.java b/community/neo4j/src/test/java/schema/IndexPopulationFlipRaceIT.java index ceeee7f3b51fe..6f1f0d3a8d40d 100644 --- a/community/neo4j/src/test/java/schema/IndexPopulationFlipRaceIT.java +++ b/community/neo4j/src/test/java/schema/IndexPopulationFlipRaceIT.java @@ -26,19 +26,17 @@ import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; import org.neo4j.helpers.collection.Pair; -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; import org.neo4j.kernel.api.index.IndexDescriptor; -import org.neo4j.test.DatabaseRule; -import org.neo4j.test.EmbeddedDatabaseRule; -import org.neo4j.test.RandomRule; - -import static org.junit.Assert.assertEquals; +import org.neo4j.kernel.api.security.AccessMode; +import org.neo4j.test.rule.DatabaseRule; +import org.neo4j.test.rule.EmbeddedDatabaseRule; +import org.neo4j.test.rule.RandomRule; import static java.util.concurrent.TimeUnit.SECONDS; - +import static org.junit.Assert.assertEquals; import static org.neo4j.graphdb.Label.label; public class IndexPopulationFlipRaceIT diff --git a/community/neo4j/src/test/java/schema/MultipleIndexPopulationStressIT.java b/community/neo4j/src/test/java/schema/MultipleIndexPopulationStressIT.java index ce20f2d05532d..1286e8a27b453 100644 --- a/community/neo4j/src/test/java/schema/MultipleIndexPopulationStressIT.java +++ b/community/neo4j/src/test/java/schema/MultipleIndexPopulationStressIT.java @@ -53,11 +53,11 @@ import org.neo4j.kernel.impl.api.index.MultipleIndexPopulator; import org.neo4j.kernel.impl.logging.NullLogService; import org.neo4j.logging.NullLogProvider; -import org.neo4j.test.CleanupRule; -import org.neo4j.test.RandomRule; import org.neo4j.test.Randoms; import org.neo4j.test.RepeatRule; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.CleanupRule; +import org.neo4j.test.rule.RandomRule; +import org.neo4j.test.rule.TargetDirectory; import org.neo4j.unsafe.impl.batchimport.BatchImporter; import org.neo4j.unsafe.impl.batchimport.InputIterable; import org.neo4j.unsafe.impl.batchimport.ParallelBatchImporter; diff --git a/community/neo4j/src/test/java/synchronization/TestStartTransactionDuringLogRotation.java b/community/neo4j/src/test/java/synchronization/TestStartTransactionDuringLogRotation.java index 5a4feeaf0c94b..b8b56377e26c7 100644 --- a/community/neo4j/src/test/java/synchronization/TestStartTransactionDuringLogRotation.java +++ b/community/neo4j/src/test/java/synchronization/TestStartTransactionDuringLogRotation.java @@ -39,8 +39,8 @@ import org.neo4j.graphdb.factory.GraphDatabaseSettings; import org.neo4j.kernel.impl.transaction.log.rotation.LogRotation; import org.neo4j.kernel.monitoring.Monitors; -import org.neo4j.test.DatabaseRule; -import org.neo4j.test.EmbeddedDatabaseRule; +import org.neo4j.test.rule.DatabaseRule; +import org.neo4j.test.rule.EmbeddedDatabaseRule; public class TestStartTransactionDuringLogRotation { diff --git a/community/neo4j/src/test/java/upgrade/FailToStartStoreMigratorIT.java b/community/neo4j/src/test/java/upgrade/FailToStartStoreMigratorIT.java index c4f35632f5f71..a3a6721de3d60 100644 --- a/community/neo4j/src/test/java/upgrade/FailToStartStoreMigratorIT.java +++ b/community/neo4j/src/test/java/upgrade/FailToStartStoreMigratorIT.java @@ -28,10 +28,10 @@ import org.neo4j.kernel.impl.core.NonUniqueTokenException; import org.neo4j.kernel.impl.storemigration.legacystore.LegacyStore; import org.neo4j.kernel.lifecycle.LifecycleException; -import org.neo4j.test.CleanupRule; -import org.neo4j.test.TargetDirectory; import org.neo4j.test.TestGraphDatabaseFactory; import org.neo4j.test.Unzip; +import org.neo4j.test.rule.CleanupRule; +import org.neo4j.test.rule.TargetDirectory; import static org.hamcrest.CoreMatchers.instanceOf; import static org.junit.Assert.assertNull; diff --git a/community/neo4j/src/test/java/upgrade/StoreUpgradeOnStartupTest.java b/community/neo4j/src/test/java/upgrade/StoreUpgradeOnStartupTest.java index 7ca1785cc610e..d6033999c2f84 100644 --- a/community/neo4j/src/test/java/upgrade/StoreUpgradeOnStartupTest.java +++ b/community/neo4j/src/test/java/upgrade/StoreUpgradeOnStartupTest.java @@ -44,9 +44,9 @@ import org.neo4j.kernel.impl.store.format.lowlimit.LowLimitV2_3; import org.neo4j.kernel.impl.storemigration.StoreUpgrader; import org.neo4j.kernel.impl.storemigration.StoreVersionCheck; -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.junit.Assert.assertThat; diff --git a/community/neo4j/src/test/java/upgrade/StoreUpgraderInterruptionTestIT.java b/community/neo4j/src/test/java/upgrade/StoreUpgraderInterruptionTestIT.java index a9ac9ef4f8abd..602f66c88c233 100644 --- a/community/neo4j/src/test/java/upgrade/StoreUpgraderInterruptionTestIT.java +++ b/community/neo4j/src/test/java/upgrade/StoreUpgraderInterruptionTestIT.java @@ -59,14 +59,13 @@ import org.neo4j.kernel.impl.storemigration.participant.SchemaIndexMigrator; import org.neo4j.kernel.impl.storemigration.participant.StoreMigrator; import org.neo4j.logging.NullLogProvider; -import org.neo4j.test.PageCacheRule; -import org.neo4j.test.TargetDirectory; -import org.neo4j.test.TargetDirectory.TestDirectory; +import org.neo4j.test.rule.PageCacheRule; +import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory.TestDirectory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; - import static org.neo4j.consistency.store.StoreAssertions.assertConsistentStore; import static org.neo4j.kernel.impl.storemigration.MigrationTestUtils.allLegacyStoreFilesHaveVersion; import static org.neo4j.kernel.impl.storemigration.MigrationTestUtils.allStoreFilesHaveNoTrailer; diff --git a/community/neo4j/src/test/java/upgrade/StoreUpgraderTest.java b/community/neo4j/src/test/java/upgrade/StoreUpgraderTest.java index e513b14593c05..f3c67d01a7962 100644 --- a/community/neo4j/src/test/java/upgrade/StoreUpgraderTest.java +++ b/community/neo4j/src/test/java/upgrade/StoreUpgraderTest.java @@ -70,9 +70,9 @@ import org.neo4j.kernel.impl.storemigration.participant.SchemaIndexMigrator; import org.neo4j.kernel.impl.storemigration.participant.StoreMigrator; import org.neo4j.logging.NullLogProvider; -import org.neo4j.test.PageCacheRule; -import org.neo4j.test.TargetDirectory; -import org.neo4j.test.TargetDirectory.TestDirectory; +import org.neo4j.test.rule.PageCacheRule; +import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory.TestDirectory; import static java.util.concurrent.TimeUnit.MINUTES; import static org.hamcrest.Matchers.emptyCollectionOf; diff --git a/community/neo4j/src/test/java/upgrade/TestMigrateToDenseNodeSupport.java b/community/neo4j/src/test/java/upgrade/TestMigrateToDenseNodeSupport.java index b4582b7506b5d..63a50b7aea60e 100644 --- a/community/neo4j/src/test/java/upgrade/TestMigrateToDenseNodeSupport.java +++ b/community/neo4j/src/test/java/upgrade/TestMigrateToDenseNodeSupport.java @@ -45,9 +45,9 @@ import org.neo4j.kernel.api.security.AccessMode; import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.storageengine.api.NodeItem; -import org.neo4j.test.TargetDirectory; import org.neo4j.test.TestGraphDatabaseFactory; import org.neo4j.test.Unzip; +import org.neo4j.test.rule.TargetDirectory; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; diff --git a/community/neo4j/src/test/java/visibility/TestPropertyReadOnNewEntityBeforeLockRelease.java b/community/neo4j/src/test/java/visibility/TestPropertyReadOnNewEntityBeforeLockRelease.java index 710eafa9c727c..8165a1b52b953 100644 --- a/community/neo4j/src/test/java/visibility/TestPropertyReadOnNewEntityBeforeLockRelease.java +++ b/community/neo4j/src/test/java/visibility/TestPropertyReadOnNewEntityBeforeLockRelease.java @@ -35,10 +35,10 @@ import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; -import org.neo4j.test.DatabaseRule; -import org.neo4j.test.ImpermanentDatabaseRule; import org.neo4j.test.RepeatRule; import org.neo4j.test.RepeatRule.Repeat; +import org.neo4j.test.rule.DatabaseRule; +import org.neo4j.test.rule.ImpermanentDatabaseRule; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; diff --git a/community/resource/src/main/java/org/neo4j/graphdb/Resource.java b/community/resource/src/main/java/org/neo4j/graphdb/Resource.java index e49e926b09093..66d6214d7d5f1 100644 --- a/community/resource/src/main/java/org/neo4j/graphdb/Resource.java +++ b/community/resource/src/main/java/org/neo4j/graphdb/Resource.java @@ -31,11 +31,6 @@ public interface Resource extends AutoCloseable /** * Empty resource that doesn't {@link #close() close} anything. */ - Resource EMPTY = new Resource() - { - @Override - public void close() - { // Nothing to close - } + Resource EMPTY = () -> { // Nothing to close }; } diff --git a/community/server/src/test/java/org/neo4j/server/BaseBootstrapperTest.java b/community/server/src/test/java/org/neo4j/server/BaseBootstrapperTest.java index e3508d5211c7b..a0a6341373a20 100644 --- a/community/server/src/test/java/org/neo4j/server/BaseBootstrapperTest.java +++ b/community/server/src/test/java/org/neo4j/server/BaseBootstrapperTest.java @@ -19,17 +19,17 @@ */ package org.neo4j.server; -import java.io.File; -import java.io.IOException; -import java.util.Map; -import java.util.concurrent.TimeUnit; - import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import java.io.File; +import java.io.IOException; +import java.util.Map; +import java.util.concurrent.TimeUnit; + import org.neo4j.graphdb.config.Setting; import org.neo4j.server.configuration.ConfigLoader; import org.neo4j.test.server.ExclusiveServerTestBase; @@ -38,7 +38,6 @@ import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; - import static org.neo4j.dbms.DatabaseManagementSystemSettings.data_directory; import static org.neo4j.graphdb.factory.GraphDatabaseSettings.auth_store; import static org.neo4j.graphdb.factory.GraphDatabaseSettings.forced_kernel_id; @@ -46,7 +45,7 @@ import static org.neo4j.helpers.collection.MapUtil.stringMap; import static org.neo4j.server.configuration.ServerSettings.tls_certificate_file; import static org.neo4j.server.configuration.ServerSettings.tls_key_file; -import static org.neo4j.test.Assert.assertEventually; +import static org.neo4j.test.assertion.Assert.assertEventually; public abstract class BaseBootstrapperTest extends ExclusiveServerTestBase { 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 82fcf6d89fa97..98adf4e1d2f33 100644 --- a/community/server/src/test/java/org/neo4j/server/BlockingBootstrapperTest.java +++ b/community/server/src/test/java/org/neo4j/server/BlockingBootstrapperTest.java @@ -19,20 +19,19 @@ */ package org.neo4j.server; +import org.junit.Test; + import java.io.File; import java.util.Optional; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; - import org.neo4j.helpers.collection.Pair; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; - -import static org.neo4j.test.Assert.assertEventually; +import static org.neo4j.test.assertion.Assert.assertEventually; public class BlockingBootstrapperTest { diff --git a/community/server/src/test/java/org/neo4j/server/configuration/ConfigLoaderTest.java b/community/server/src/test/java/org/neo4j/server/configuration/ConfigLoaderTest.java index 27412325b4b2a..1ce209a8bcd1f 100644 --- a/community/server/src/test/java/org/neo4j/server/configuration/ConfigLoaderTest.java +++ b/community/server/src/test/java/org/neo4j/server/configuration/ConfigLoaderTest.java @@ -37,7 +37,7 @@ import org.neo4j.logging.NullLog; import org.neo4j.server.CommunityBootstrapper; import org.neo4j.server.ServerTestUtils; -import org.neo4j.test.SuppressOutput; +import org.neo4j.test.rule.SuppressOutput; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertEquals; @@ -46,7 +46,7 @@ import static org.neo4j.kernel.configuration.Settings.NO_DEFAULT; import static org.neo4j.kernel.configuration.Settings.STRING; import static org.neo4j.kernel.configuration.Settings.setting; -import static org.neo4j.test.SuppressOutput.suppressAll; +import static org.neo4j.test.rule.SuppressOutput.suppressAll; public class ConfigLoaderTest { diff --git a/community/server/src/test/java/org/neo4j/server/database/TestLifecycleManagedDatabase.java b/community/server/src/test/java/org/neo4j/server/database/TestLifecycleManagedDatabase.java index 7ba23b0da03cc..dc967eee35844 100644 --- a/community/server/src/test/java/org/neo4j/server/database/TestLifecycleManagedDatabase.java +++ b/community/server/src/test/java/org/neo4j/server/database/TestLifecycleManagedDatabase.java @@ -34,8 +34,8 @@ import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.factory.GraphDatabaseFacade; import org.neo4j.logging.AssertableLogProvider; -import org.neo4j.test.ImpermanentDatabaseRule; -import org.neo4j.test.SuppressOutput; +import org.neo4j.test.rule.ImpermanentDatabaseRule; +import org.neo4j.test.rule.SuppressOutput; import static org.hamcrest.Matchers.is; import static org.hamcrest.core.IsInstanceOf.instanceOf; @@ -43,7 +43,7 @@ import static org.neo4j.helpers.collection.MapUtil.stringMap; import static org.neo4j.logging.AssertableLogProvider.inLog; import static org.neo4j.server.ServerTestUtils.createTempDir; -import static org.neo4j.test.SuppressOutput.suppressAll; +import static org.neo4j.test.rule.SuppressOutput.suppressAll; public class TestLifecycleManagedDatabase { 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 7e1a5177a460b..23d5e0af93d37 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 @@ -19,13 +19,6 @@ */ package org.neo4j.server.integration; -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Optional; - import org.hamcrest.Description; import org.hamcrest.Matcher; import org.hamcrest.TypeSafeMatcher; @@ -33,6 +26,13 @@ import org.junit.Rule; import org.junit.Test; +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Optional; + import org.neo4j.dbms.DatabaseManagementSystemSettings; import org.neo4j.graphdb.factory.GraphDatabaseSettings; import org.neo4j.helpers.collection.Pair; @@ -40,13 +40,11 @@ import org.neo4j.kernel.configuration.Settings; import org.neo4j.server.CommunityBootstrapper; import org.neo4j.server.ServerTestUtils; -import org.neo4j.test.SuppressOutput; +import org.neo4j.test.rule.SuppressOutput; import org.neo4j.test.server.ExclusiveServerTestBase; import static java.util.Arrays.asList; - import static org.hamcrest.MatcherAssert.assertThat; - import static org.neo4j.server.configuration.ServerSettings.httpConnector; public class StartupLoggingIT extends ExclusiveServerTestBase diff --git a/community/server/src/test/java/org/neo4j/server/modules/DBMSModuleTest.java b/community/server/src/test/java/org/neo4j/server/modules/DBMSModuleTest.java index a0b01f1953846..00d57280ebeca 100644 --- a/community/server/src/test/java/org/neo4j/server/modules/DBMSModuleTest.java +++ b/community/server/src/test/java/org/neo4j/server/modules/DBMSModuleTest.java @@ -19,19 +19,22 @@ */ package org.neo4j.server.modules; +import org.junit.Rule; +import org.junit.Test; + import java.net.URI; import java.util.List; -import org.junit.Rule; -import org.junit.Test; import org.neo4j.server.CommunityNeoServer; import org.neo4j.server.web.WebServer; -import org.neo4j.test.SuppressOutput; +import org.neo4j.test.rule.SuppressOutput; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyCollection; import static org.mockito.Matchers.anyString; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; public class DBMSModuleTest { diff --git a/community/server/src/test/java/org/neo4j/server/preflight/TestPreflightTasks.java b/community/server/src/test/java/org/neo4j/server/preflight/TestPreflightTasks.java index 3ceeb3eb1111a..2ceeaa7404d5b 100644 --- a/community/server/src/test/java/org/neo4j/server/preflight/TestPreflightTasks.java +++ b/community/server/src/test/java/org/neo4j/server/preflight/TestPreflightTasks.java @@ -21,15 +21,16 @@ import org.junit.Rule; import org.junit.Test; + import org.neo4j.logging.AssertableLogProvider; import org.neo4j.logging.NullLogProvider; -import org.neo4j.test.SuppressOutput; +import org.neo4j.test.rule.SuppressOutput; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.neo4j.logging.AssertableLogProvider.inLog; -import static org.neo4j.test.SuppressOutput.suppressAll; +import static org.neo4j.test.rule.SuppressOutput.suppressAll; public class TestPreflightTasks { diff --git a/community/server/src/test/java/org/neo4j/server/rest/BatchOperationDocIT.java b/community/server/src/test/java/org/neo4j/server/rest/BatchOperationDocIT.java index b429148b4dd62..20d0c2cfb8b19 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/BatchOperationDocIT.java +++ b/community/server/src/test/java/org/neo4j/server/rest/BatchOperationDocIT.java @@ -40,8 +40,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -import static org.neo4j.graphdb.Neo4jMatchers.hasProperty; -import static org.neo4j.graphdb.Neo4jMatchers.inTx; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.hasProperty; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.inTx; public class BatchOperationDocIT extends AbstractRestFunctionalDocTestBase { diff --git a/community/server/src/test/java/org/neo4j/server/rest/IndexNodeDocIT.java b/community/server/src/test/java/org/neo4j/server/rest/IndexNodeDocIT.java index a36cf6eeec5a5..8fad3e2ea9d34 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/IndexNodeDocIT.java +++ b/community/server/src/test/java/org/neo4j/server/rest/IndexNodeDocIT.java @@ -54,9 +54,9 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -import static org.neo4j.graphdb.Neo4jMatchers.hasProperty; -import static org.neo4j.graphdb.Neo4jMatchers.inTx; import static org.neo4j.server.helpers.FunctionalTestHelper.CLIENT; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.hasProperty; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.inTx; public class IndexNodeDocIT extends AbstractRestFunctionalTestBase { diff --git a/community/server/src/test/java/org/neo4j/server/rest/LabelsDocIT.java b/community/server/src/test/java/org/neo4j/server/rest/LabelsDocIT.java index 6a1697db68f28..88b1a2894044e 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/LabelsDocIT.java +++ b/community/server/src/test/java/org/neo4j/server/rest/LabelsDocIT.java @@ -43,15 +43,15 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.neo4j.graphdb.Label.label; -import static org.neo4j.graphdb.Neo4jMatchers.hasLabel; -import static org.neo4j.graphdb.Neo4jMatchers.hasLabels; -import static org.neo4j.graphdb.Neo4jMatchers.inTx; import static org.neo4j.helpers.collection.Iterables.map; import static org.neo4j.helpers.collection.Iterators.asSet; import static org.neo4j.server.rest.domain.JsonHelper.createJsonFrom; import static org.neo4j.server.rest.domain.JsonHelper.readJson; import static org.neo4j.test.GraphDescription.PropType.ARRAY; import static org.neo4j.test.GraphDescription.PropType.STRING; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.hasLabel; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.hasLabels; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.inTx; public class LabelsDocIT extends AbstractRestFunctionalTestBase { diff --git a/community/server/src/test/java/org/neo4j/server/rest/ManageNodeDocIT.java b/community/server/src/test/java/org/neo4j/server/rest/ManageNodeDocIT.java index 13fd8c0a64334..b8b546a04ad11 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/ManageNodeDocIT.java +++ b/community/server/src/test/java/org/neo4j/server/rest/ManageNodeDocIT.java @@ -93,7 +93,7 @@ import static org.mockito.Mockito.when; import static org.neo4j.helpers.collection.MapUtil.stringMap; import static org.neo4j.server.configuration.ServerSettings.httpConnector; -import static org.neo4j.test.SuppressOutput.suppressAll; +import static org.neo4j.test.rule.SuppressOutput.suppressAll; public class ManageNodeDocIT extends AbstractRestFunctionalDocTestBase { diff --git a/community/server/src/test/java/org/neo4j/server/rest/RelationshipDocIT.java b/community/server/src/test/java/org/neo4j/server/rest/RelationshipDocIT.java index 0297cdbbf4c8c..bd5e1935842a2 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/RelationshipDocIT.java +++ b/community/server/src/test/java/org/neo4j/server/rest/RelationshipDocIT.java @@ -47,8 +47,8 @@ import static org.hamcrest.core.IsNot.not; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -import static org.neo4j.graphdb.Neo4jMatchers.hasProperty; -import static org.neo4j.graphdb.Neo4jMatchers.inTx; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.hasProperty; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.inTx; public class RelationshipDocIT extends AbstractRestFunctionalDocTestBase { diff --git a/community/server/src/test/java/org/neo4j/server/rest/SchemaConstraintsDocIT.java b/community/server/src/test/java/org/neo4j/server/rest/SchemaConstraintsDocIT.java index 873fd71dc2496..b1c1834788a8e 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/SchemaConstraintsDocIT.java +++ b/community/server/src/test/java/org/neo4j/server/rest/SchemaConstraintsDocIT.java @@ -40,13 +40,13 @@ import static org.hamcrest.Matchers.hasItems; import static org.junit.Assert.assertThat; import static org.neo4j.graphdb.Label.label; -import static org.neo4j.graphdb.Neo4jMatchers.containsOnly; -import static org.neo4j.graphdb.Neo4jMatchers.getConstraints; -import static org.neo4j.graphdb.Neo4jMatchers.isEmpty; import static org.neo4j.helpers.collection.MapUtil.map; import static org.neo4j.server.rest.domain.JsonHelper.createJsonFrom; import static org.neo4j.server.rest.domain.JsonHelper.jsonToList; import static org.neo4j.server.rest.domain.JsonHelper.jsonToMap; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.containsOnly; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.getConstraints; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.isEmpty; public class SchemaConstraintsDocIT extends AbstractRestFunctionalTestBase { diff --git a/community/server/src/test/java/org/neo4j/server/rest/SchemaIndexDocIT.java b/community/server/src/test/java/org/neo4j/server/rest/SchemaIndexDocIT.java index 1d1796947be7b..954c868106ff4 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/SchemaIndexDocIT.java +++ b/community/server/src/test/java/org/neo4j/server/rest/SchemaIndexDocIT.java @@ -26,12 +26,12 @@ import java.util.Map; import org.neo4j.function.Factory; -import org.neo4j.graphdb.Neo4jMatchers; import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.schema.IndexDefinition; import org.neo4j.kernel.impl.annotations.Documented; import org.neo4j.server.rest.domain.JsonParseException; import org.neo4j.test.GraphDescription; +import org.neo4j.test.mockito.matcher.Neo4jMatchers; import static java.util.Arrays.asList; import static java.util.Collections.singletonList; @@ -41,11 +41,11 @@ import static org.hamcrest.core.IsNot.not; import static org.junit.Assert.assertThat; import static org.neo4j.graphdb.Label.label; -import static org.neo4j.graphdb.Neo4jMatchers.containsOnly; import static org.neo4j.helpers.collection.MapUtil.map; import static org.neo4j.server.rest.domain.JsonHelper.createJsonFrom; import static org.neo4j.server.rest.domain.JsonHelper.jsonToList; import static org.neo4j.server.rest.domain.JsonHelper.jsonToMap; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.containsOnly; public class SchemaIndexDocIT extends AbstractRestFunctionalTestBase { diff --git a/community/server/src/test/java/org/neo4j/server/rest/SetNodePropertiesDocIT.java b/community/server/src/test/java/org/neo4j/server/rest/SetNodePropertiesDocIT.java index e2cb98f7d6cbe..bdf774c69c094 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/SetNodePropertiesDocIT.java +++ b/community/server/src/test/java/org/neo4j/server/rest/SetNodePropertiesDocIT.java @@ -37,8 +37,8 @@ import static org.hamcrest.core.IsNot.not; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; -import static org.neo4j.graphdb.Neo4jMatchers.hasProperty; -import static org.neo4j.graphdb.Neo4jMatchers.inTx; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.hasProperty; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.inTx; public class SetNodePropertiesDocIT extends AbstractRestFunctionalTestBase diff --git a/community/server/src/test/java/org/neo4j/server/rest/paging/PagedTraverserDocIT.java b/community/server/src/test/java/org/neo4j/server/rest/paging/PagedTraverserDocIT.java index b3e83a702694d..31eb7fb380e70 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/paging/PagedTraverserDocIT.java +++ b/community/server/src/test/java/org/neo4j/server/rest/paging/PagedTraverserDocIT.java @@ -56,7 +56,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; -import static org.neo4j.test.SuppressOutput.suppressAll; +import static org.neo4j.test.rule.SuppressOutput.suppressAll; public class PagedTraverserDocIT extends ExclusiveServerTestBase { diff --git a/community/server/src/test/java/org/neo4j/server/rest/paging/PagedTraverserTest.java b/community/server/src/test/java/org/neo4j/server/rest/paging/PagedTraverserTest.java index b47234eefb8d9..8ceaf1b6528e7 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/paging/PagedTraverserTest.java +++ b/community/server/src/test/java/org/neo4j/server/rest/paging/PagedTraverserTest.java @@ -19,12 +19,12 @@ */ package org.neo4j.server.rest.paging; -import java.util.List; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import java.util.List; + import org.neo4j.graphdb.Direction; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Node; @@ -34,7 +34,7 @@ import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.traversal.Traverser; import org.neo4j.graphdb.traversal.Uniqueness; -import org.neo4j.test.ImpermanentDatabaseRule; +import org.neo4j.test.rule.ImpermanentDatabaseRule; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; diff --git a/community/server/src/test/java/org/neo4j/server/rest/repr/CypherResultRepresentationTest.java b/community/server/src/test/java/org/neo4j/server/rest/repr/CypherResultRepresentationTest.java index 138ab7e9438ac..18fd7937c8ca8 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/repr/CypherResultRepresentationTest.java +++ b/community/server/src/test/java/org/neo4j/server/rest/repr/CypherResultRepresentationTest.java @@ -19,36 +19,37 @@ */ package org.neo4j.server.rest.repr; +import org.junit.Rule; +import org.junit.Test; + import java.net.URI; import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.junit.Rule; -import org.junit.Test; - -import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.ExecutionPlanDescription; +import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Result; import org.neo4j.graphdb.Transaction; import org.neo4j.helpers.collection.MapUtil; import org.neo4j.server.rest.repr.formats.JsonFormat; -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.Arrays.asList; - import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; - import static org.neo4j.server.rest.domain.JsonHelper.jsonToMap; public class CypherResultRepresentationTest { + @Rule + public DatabaseRule database = new ImpermanentDatabaseRule(); + @Test @SuppressWarnings("unchecked") public void shouldSerializeProfilingResult() throws Exception @@ -106,9 +107,6 @@ public void shouldNotIncludePlanUnlessAskedFor() throws Exception assertFalse( "Didn't expect to see a plan here", serialized.containsKey( "plan" ) ); } - @Rule - public DatabaseRule database = new ImpermanentDatabaseRule(); - @Test public void shouldFormatMapsProperly() throws Exception { diff --git a/community/server/src/test/java/org/neo4j/server/rest/repr/NodeRepresentationTest.java b/community/server/src/test/java/org/neo4j/server/rest/repr/NodeRepresentationTest.java index 407fee2b16edb..d1a89e7733b64 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/repr/NodeRepresentationTest.java +++ b/community/server/src/test/java/org/neo4j/server/rest/repr/NodeRepresentationTest.java @@ -19,21 +19,19 @@ */ package org.neo4j.server.rest.repr; +import org.junit.Test; + import java.util.List; import java.util.Map; -import org.junit.Test; - import static java.util.Arrays.asList; - import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; - import static org.neo4j.server.rest.repr.RepresentationTestAccess.serialize; import static org.neo4j.server.rest.repr.RepresentationTestBase.assertUriMatches; import static org.neo4j.server.rest.repr.RepresentationTestBase.uriPattern; -import static org.neo4j.test.mocking.GraphMock.node; -import static org.neo4j.test.mocking.Properties.properties; +import static org.neo4j.test.mockito.mock.GraphMock.node; +import static org.neo4j.test.mockito.mock.Properties.properties; public class NodeRepresentationTest { diff --git a/community/server/src/test/java/org/neo4j/server/rest/repr/PathRepresentationTest.java b/community/server/src/test/java/org/neo4j/server/rest/repr/PathRepresentationTest.java index 0b104a63adb9f..8d6d5da8bf78b 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/repr/PathRepresentationTest.java +++ b/community/server/src/test/java/org/neo4j/server/rest/repr/PathRepresentationTest.java @@ -20,13 +20,14 @@ package org.neo4j.server.rest.repr; import org.junit.Test; -import org.neo4j.graphdb.Node; -import org.neo4j.graphdb.Path; -import org.neo4j.graphdb.Relationship; import java.util.List; import java.util.Map; +import org.neo4j.graphdb.Node; +import org.neo4j.graphdb.Path; +import org.neo4j.graphdb.Relationship; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -34,11 +35,11 @@ import static org.neo4j.server.rest.repr.RepresentationTestBase.NODE_URI_PATTERN; import static org.neo4j.server.rest.repr.RepresentationTestBase.RELATIONSHIP_URI_PATTERN; import static org.neo4j.server.rest.repr.RepresentationTestBase.assertUriMatches; -import static org.neo4j.test.mocking.GraphMock.node; -import static org.neo4j.test.mocking.GraphMock.path; -import static org.neo4j.test.mocking.GraphMock.relationship; -import static org.neo4j.test.mocking.Link.link; -import static org.neo4j.test.mocking.Properties.properties; +import static org.neo4j.test.mockito.mock.GraphMock.node; +import static org.neo4j.test.mockito.mock.GraphMock.path; +import static org.neo4j.test.mockito.mock.GraphMock.relationship; +import static org.neo4j.test.mockito.mock.Link.link; +import static org.neo4j.test.mockito.mock.Properties.properties; public class PathRepresentationTest { diff --git a/community/server/src/test/java/org/neo4j/server/rest/repr/RelationshipRepresentationTest.java b/community/server/src/test/java/org/neo4j/server/rest/repr/RelationshipRepresentationTest.java index 88e072ba89b8d..597ab6207dafa 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/repr/RelationshipRepresentationTest.java +++ b/community/server/src/test/java/org/neo4j/server/rest/repr/RelationshipRepresentationTest.java @@ -19,18 +19,19 @@ */ package org.neo4j.server.rest.repr; -import java.util.Map; - import org.junit.Test; -import static org.junit.Assert.assertNotNull; +import java.util.Map; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.neo4j.server.rest.repr.RepresentationTestAccess.serialize; -import static org.neo4j.server.rest.repr.RepresentationTestBase.*; -import static org.neo4j.test.mocking.GraphMock.node; -import static org.neo4j.test.mocking.GraphMock.relationship; -import static org.neo4j.test.mocking.Properties.properties; +import static org.neo4j.server.rest.repr.RepresentationTestBase.NODE_URI_PATTERN; +import static org.neo4j.server.rest.repr.RepresentationTestBase.RELATIONSHIP_URI_PATTERN; +import static org.neo4j.server.rest.repr.RepresentationTestBase.assertUriMatches; +import static org.neo4j.test.mockito.mock.GraphMock.node; +import static org.neo4j.test.mockito.mock.GraphMock.relationship; +import static org.neo4j.test.mockito.mock.Properties.properties; public class RelationshipRepresentationTest { diff --git a/community/server/src/test/java/org/neo4j/server/rest/streaming/StreamingBatchOperationDocIT.java b/community/server/src/test/java/org/neo4j/server/rest/streaming/StreamingBatchOperationDocIT.java index 9e38cc01eb462..1f23408ea893b 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/streaming/StreamingBatchOperationDocIT.java +++ b/community/server/src/test/java/org/neo4j/server/rest/streaming/StreamingBatchOperationDocIT.java @@ -27,7 +27,6 @@ import java.util.List; import java.util.Map; -import org.neo4j.graphdb.Neo4jMatchers; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; import org.neo4j.helpers.collection.Iterables; @@ -40,6 +39,7 @@ import org.neo4j.server.rest.repr.BadInputException; import org.neo4j.server.rest.repr.StreamingFormat; import org.neo4j.test.GraphDescription.Graph; +import org.neo4j.test.mockito.matcher.Neo4jMatchers; import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; import static org.hamcrest.Matchers.containsString; @@ -47,7 +47,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -import static org.neo4j.graphdb.Neo4jMatchers.inTx; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.inTx; public class StreamingBatchOperationDocIT extends AbstractRestFunctionalTestBase { diff --git a/community/server/src/test/java/org/neo4j/server/rest/transactional/ExecutionResultSerializerTest.java b/community/server/src/test/java/org/neo4j/server/rest/transactional/ExecutionResultSerializerTest.java index 76f28cccc4a27..b32ef414b6e4b 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/transactional/ExecutionResultSerializerTest.java +++ b/community/server/src/test/java/org/neo4j/server/rest/transactional/ExecutionResultSerializerTest.java @@ -58,8 +58,8 @@ import org.neo4j.logging.NullLogProvider; import org.neo4j.server.rest.domain.JsonParseException; import org.neo4j.server.rest.transactional.error.Neo4jError; -import org.neo4j.test.mocking.GraphMock; -import org.neo4j.test.mocking.Link; +import org.neo4j.test.mockito.mock.GraphMock; +import org.neo4j.test.mockito.mock.Link; import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.Arrays.asList; @@ -77,11 +77,11 @@ import static org.neo4j.server.rest.domain.JsonHelper.jsonNode; import static org.neo4j.server.rest.domain.JsonHelper.readJson; import static org.neo4j.test.Property.property; -import static org.neo4j.test.mocking.GraphMock.link; -import static org.neo4j.test.mocking.GraphMock.node; -import static org.neo4j.test.mocking.GraphMock.path; -import static org.neo4j.test.mocking.GraphMock.relationship; -import static org.neo4j.test.mocking.Properties.properties; +import static org.neo4j.test.mockito.mock.GraphMock.link; +import static org.neo4j.test.mockito.mock.GraphMock.node; +import static org.neo4j.test.mockito.mock.GraphMock.path; +import static org.neo4j.test.mockito.mock.GraphMock.relationship; +import static org.neo4j.test.mockito.mock.Properties.properties; public class ExecutionResultSerializerTest extends TxStateCheckerTestSupport { diff --git a/community/server/src/test/java/org/neo4j/server/rest/transactional/GraphExtractionWriterTest.java b/community/server/src/test/java/org/neo4j/server/rest/transactional/GraphExtractionWriterTest.java index 3d8cdbdb6c349..ebc046a6d1bb6 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/transactional/GraphExtractionWriterTest.java +++ b/community/server/src/test/java/org/neo4j/server/rest/transactional/GraphExtractionWriterTest.java @@ -44,11 +44,11 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.neo4j.test.Property.property; -import static org.neo4j.test.mocking.GraphMock.node; -import static org.neo4j.test.mocking.GraphMock.path; -import static org.neo4j.test.mocking.GraphMock.relationship; -import static org.neo4j.test.mocking.Link.link; -import static org.neo4j.test.mocking.Properties.properties; +import static org.neo4j.test.mockito.mock.GraphMock.node; +import static org.neo4j.test.mockito.mock.GraphMock.path; +import static org.neo4j.test.mockito.mock.GraphMock.relationship; +import static org.neo4j.test.mockito.mock.Link.link; +import static org.neo4j.test.mockito.mock.Properties.properties; public class GraphExtractionWriterTest { diff --git a/community/server/src/test/java/org/neo4j/server/rest/transactional/integration/DeadlockIT.java b/community/server/src/test/java/org/neo4j/server/rest/transactional/integration/DeadlockIT.java index 2531befc4210b..1efd755bb55b8 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/transactional/integration/DeadlockIT.java +++ b/community/server/src/test/java/org/neo4j/server/rest/transactional/integration/DeadlockIT.java @@ -19,22 +19,22 @@ */ package org.neo4j.server.rest.transactional.integration; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; - import org.junit.Rule; import org.junit.Test; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; + import org.neo4j.graphdb.Label; import org.neo4j.graphdb.Transaction; import org.neo4j.server.rest.AbstractRestFunctionalTestBase; import org.neo4j.test.OtherThreadExecutor; -import org.neo4j.test.OtherThreadRule; +import org.neo4j.test.rule.concurrent.OtherThreadRule; import org.neo4j.test.server.HTTP; import static org.hamcrest.CoreMatchers.equalTo; -import static org.junit.Assert.*; - +import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; import static org.neo4j.kernel.api.exceptions.Status.Transaction.DeadlockDetected; import static org.neo4j.test.server.HTTP.RawPayload.quotedJson; diff --git a/community/server/src/test/java/org/neo4j/server/rest/transactional/integration/TransientErrorIT.java b/community/server/src/test/java/org/neo4j/server/rest/transactional/integration/TransientErrorIT.java index 1a77d80388e67..ffdb70d9a9375 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/transactional/integration/TransientErrorIT.java +++ b/community/server/src/test/java/org/neo4j/server/rest/transactional/integration/TransientErrorIT.java @@ -28,7 +28,7 @@ import org.neo4j.server.rest.AbstractRestFunctionalTestBase; import org.neo4j.server.rest.domain.JsonParseException; import org.neo4j.test.OtherThreadExecutor; -import org.neo4j.test.OtherThreadRule; +import org.neo4j.test.rule.concurrent.OtherThreadRule; import org.neo4j.test.server.HTTP; import static org.hamcrest.CoreMatchers.is; diff --git a/community/server/src/test/java/org/neo4j/server/rest/web/CollectUserAgentFilterTest.java b/community/server/src/test/java/org/neo4j/server/rest/web/CollectUserAgentFilterTest.java index 9088fd9ffddef..b3a01be9e2c60 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/web/CollectUserAgentFilterTest.java +++ b/community/server/src/test/java/org/neo4j/server/rest/web/CollectUserAgentFilterTest.java @@ -29,7 +29,7 @@ import javax.servlet.http.HttpServletRequest; import org.neo4j.concurrent.RecentK; -import org.neo4j.test.SuppressOutput; +import org.neo4j.test.rule.SuppressOutput; import static org.hamcrest.Matchers.hasItem; import static org.hamcrest.Matchers.hasItems; @@ -40,7 +40,7 @@ import static org.mockito.Mockito.stub; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static org.neo4j.test.SuppressOutput.suppressAll; +import static org.neo4j.test.rule.SuppressOutput.suppressAll; public class CollectUserAgentFilterTest { diff --git a/community/server/src/test/java/org/neo4j/server/web/JettyThreadLimitTest.java b/community/server/src/test/java/org/neo4j/server/web/JettyThreadLimitTest.java index a9408999c58f8..e58d94a8f6b81 100644 --- a/community/server/src/test/java/org/neo4j/server/web/JettyThreadLimitTest.java +++ b/community/server/src/test/java/org/neo4j/server/web/JettyThreadLimitTest.java @@ -19,20 +19,19 @@ */ package org.neo4j.server.web; -import java.util.concurrent.CountDownLatch; - import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.junit.Rule; import org.junit.Test; +import java.util.concurrent.CountDownLatch; + import org.neo4j.helpers.HostnamePort; import org.neo4j.kernel.configuration.Config; import org.neo4j.logging.NullLogProvider; -import org.neo4j.test.SuppressOutput; +import org.neo4j.test.rule.SuppressOutput; import static org.junit.Assert.assertEquals; - -import static org.neo4j.test.SuppressOutput.suppressAll; +import static org.neo4j.test.rule.SuppressOutput.suppressAll; public class JettyThreadLimitTest { diff --git a/community/server/src/test/java/org/neo4j/server/web/TestJetty9WebServer.java b/community/server/src/test/java/org/neo4j/server/web/TestJetty9WebServer.java index 053726925b676..649d9f4aa3c86 100644 --- a/community/server/src/test/java/org/neo4j/server/web/TestJetty9WebServer.java +++ b/community/server/src/test/java/org/neo4j/server/web/TestJetty9WebServer.java @@ -28,14 +28,13 @@ import org.neo4j.logging.NullLogProvider; import org.neo4j.server.CommunityNeoServer; import org.neo4j.server.helpers.CommunityServerBuilder; -import org.neo4j.test.ImpermanentDatabaseRule; -import org.neo4j.test.SuppressOutput; +import org.neo4j.test.rule.ImpermanentDatabaseRule; +import org.neo4j.test.rule.SuppressOutput; import org.neo4j.test.server.ExclusiveServerTestBase; import org.neo4j.test.server.HTTP; import static org.junit.Assert.assertEquals; - -import static org.neo4j.test.SuppressOutput.suppressAll; +import static org.neo4j.test.rule.SuppressOutput.suppressAll; public class TestJetty9WebServer extends ExclusiveServerTestBase { 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 ddab490e47f3b..3c87732bcd376 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 @@ -23,6 +23,13 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; + +import java.io.File; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.UUID; +import java.util.concurrent.TimeUnit; + import org.neo4j.function.ThrowingSupplier; import org.neo4j.graphdb.factory.GraphDatabaseSettings; import org.neo4j.server.NeoServer; @@ -31,20 +38,14 @@ import org.neo4j.server.helpers.FunctionalTestHelper; import org.neo4j.server.rest.JaxRsResponse; import org.neo4j.server.rest.RestRequest; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import org.neo4j.test.server.ExclusiveServerTestBase; -import java.io.File; -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.util.UUID; -import java.util.concurrent.TimeUnit; - import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.Matchers.containsString; import static org.junit.Assert.assertThat; import static org.neo4j.io.fs.FileUtils.readTextFile; -import static org.neo4j.test.Assert.assertEventually; +import static org.neo4j.test.assertion.Assert.assertEventually; public class HTTPLoggingDocIT extends ExclusiveServerTestBase { 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 745931085baab..6c6dee4e2ac62 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 @@ -25,10 +25,10 @@ import java.util.concurrent.Callable; -import org.neo4j.test.SuppressOutput; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.SuppressOutput; +import org.neo4j.test.rule.TargetDirectory; -import static org.neo4j.test.SuppressOutput.suppressAll; +import static org.neo4j.test.rule.SuppressOutput.suppressAll; public class ExclusiveServerTestBase { diff --git a/community/server/src/test/java/org/neo4j/test/server/SharedServerTestBase.java b/community/server/src/test/java/org/neo4j/test/server/SharedServerTestBase.java index 8c4d75fc1453d..f58e7fa7a161d 100644 --- a/community/server/src/test/java/org/neo4j/test/server/SharedServerTestBase.java +++ b/community/server/src/test/java/org/neo4j/test/server/SharedServerTestBase.java @@ -25,12 +25,12 @@ import java.util.concurrent.Callable; +import org.neo4j.graphdb.factory.GraphDatabaseSettings; import org.neo4j.server.NeoServer; import org.neo4j.server.helpers.ServerHelper; -import org.neo4j.test.SuppressOutput; -import org.neo4j.graphdb.factory.GraphDatabaseSettings; +import org.neo4j.test.rule.SuppressOutput; -import static org.neo4j.test.SuppressOutput.suppressAll; +import static org.neo4j.test.rule.SuppressOutput.suppressAll; public class SharedServerTestBase { diff --git a/community/shell/src/test/java/org/neo4j/shell/AbstractShellTest.java b/community/shell/src/test/java/org/neo4j/shell/AbstractShellTest.java index 8dd8e38298d8a..b63352c591a50 100644 --- a/community/shell/src/test/java/org/neo4j/shell/AbstractShellTest.java +++ b/community/shell/src/test/java/org/neo4j/shell/AbstractShellTest.java @@ -41,8 +41,8 @@ import org.neo4j.shell.impl.SameJvmClient; import org.neo4j.shell.impl.SimpleAppServer; import org.neo4j.shell.kernel.GraphDatabaseShellServer; -import org.neo4j.test.EphemeralFileSystemRule; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static java.lang.Integer.parseInt; import static java.util.regex.Pattern.compile; diff --git a/community/shell/src/test/java/org/neo4j/shell/ErrorsAndWarningsTest.java b/community/shell/src/test/java/org/neo4j/shell/ErrorsAndWarningsTest.java index 461847cf19600..c0a405afab352 100644 --- a/community/shell/src/test/java/org/neo4j/shell/ErrorsAndWarningsTest.java +++ b/community/shell/src/test/java/org/neo4j/shell/ErrorsAndWarningsTest.java @@ -32,7 +32,7 @@ import org.neo4j.graphdb.factory.GraphDatabaseSettings; import org.neo4j.kernel.configuration.Settings; import org.neo4j.kernel.internal.GraphDatabaseAPI; -import org.neo4j.test.ImpermanentDatabaseRule; +import org.neo4j.test.rule.ImpermanentDatabaseRule; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.Matchers.not; diff --git a/community/shell/src/test/java/org/neo4j/shell/StartClientTest.java b/community/shell/src/test/java/org/neo4j/shell/StartClientTest.java index 713b5760f6184..506ae79ec6265 100644 --- a/community/shell/src/test/java/org/neo4j/shell/StartClientTest.java +++ b/community/shell/src/test/java/org/neo4j/shell/StartClientTest.java @@ -38,8 +38,8 @@ import org.neo4j.kernel.configuration.Settings; import org.neo4j.shell.impl.AbstractClient; import org.neo4j.shell.kernel.GraphDatabaseShellServer; -import org.neo4j.test.ImpermanentDatabaseRule; -import org.neo4j.test.SuppressOutput; +import org.neo4j.test.rule.ImpermanentDatabaseRule; +import org.neo4j.test.rule.SuppressOutput; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.equalTo; @@ -52,7 +52,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static org.neo4j.test.SuppressOutput.suppressAll; +import static org.neo4j.test.rule.SuppressOutput.suppressAll; public class StartClientTest { diff --git a/community/shell/src/test/java/org/neo4j/shell/TestApps.java b/community/shell/src/test/java/org/neo4j/shell/TestApps.java index e5af8e4ef9299..fd963d963aa51 100644 --- a/community/shell/src/test/java/org/neo4j/shell/TestApps.java +++ b/community/shell/src/test/java/org/neo4j/shell/TestApps.java @@ -19,6 +19,9 @@ */ package org.neo4j.shell; +import org.junit.Ignore; +import org.junit.Test; + import java.io.File; import java.io.PrintWriter; import java.io.Serializable; @@ -27,9 +30,6 @@ import java.util.concurrent.Future; import java.util.regex.Pattern; -import org.junit.Ignore; -import org.junit.Test; - import org.neo4j.cypher.NodeStillHasRelationshipsException; import org.neo4j.graphdb.ConstraintViolationException; import org.neo4j.graphdb.Direction; @@ -52,17 +52,16 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; - import static org.neo4j.graphdb.Direction.OUTGOING; import static org.neo4j.graphdb.Label.label; -import static org.neo4j.graphdb.Neo4jMatchers.findNodesByLabelAndProperty; -import static org.neo4j.graphdb.Neo4jMatchers.hasLabels; -import static org.neo4j.graphdb.Neo4jMatchers.hasProperty; -import static org.neo4j.graphdb.Neo4jMatchers.hasSize; -import static org.neo4j.graphdb.Neo4jMatchers.inTx; -import static org.neo4j.graphdb.Neo4jMatchers.waitForIndex; import static org.neo4j.graphdb.RelationshipType.withName; import static org.neo4j.helpers.collection.MapUtil.genericMap; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.findNodesByLabelAndProperty; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.hasLabels; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.hasProperty; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.hasSize; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.inTx; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.waitForIndex; public class TestApps extends AbstractShellTest { 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 525d499a87f04..e4cf044bf0920 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.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static java.lang.Runtime.getRuntime; import static java.lang.System.getProperty; diff --git a/community/shell/src/test/java/org/neo4j/shell/kernel/apps/CdTest.java b/community/shell/src/test/java/org/neo4j/shell/kernel/apps/CdTest.java index 9fe8358e9ec5b..aeeb6c1034495 100644 --- a/community/shell/src/test/java/org/neo4j/shell/kernel/apps/CdTest.java +++ b/community/shell/src/test/java/org/neo4j/shell/kernel/apps/CdTest.java @@ -19,31 +19,53 @@ */ package org.neo4j.shell.kernel.apps; -import java.util.List; - import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import java.util.List; + import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; -import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.impl.MyRelTypes; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.shell.AppCommandParser; import org.neo4j.shell.Output; import org.neo4j.shell.Session; import org.neo4j.shell.SilentLocalOutput; import org.neo4j.shell.Variables; import org.neo4j.shell.kernel.GraphDatabaseShellServer; -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.junit.Assert.assertTrue; public class CdTest { + @Rule + public final DatabaseRule dbRule = new ImpermanentDatabaseRule(); + + private final Output silence = new SilentLocalOutput(); + private final Session session = new Session( "test" ); + private GraphDatabaseAPI db; + private GraphDatabaseShellServer server; + + @Before + public void setup() throws Exception + { + db = dbRule.getGraphDatabaseAPI(); + server = new GraphDatabaseShellServer( db ); + session.set( Variables.TITLE_KEYS_KEY, "name" ); + } + + @After + public void shutdown() throws Exception + { + server.shutdown(); + } + @Test public void shouldProvideTabCompletions() throws Exception { @@ -91,24 +113,4 @@ private Node createNodeWithSomeSubNodes( String... names ) return root; } } - - private final Output silence = new SilentLocalOutput(); - private final Session session = new Session( "test" ); - public final @Rule DatabaseRule dbRule = new ImpermanentDatabaseRule(); - private GraphDatabaseAPI db; - private GraphDatabaseShellServer server; - - @Before - public void setup() throws Exception - { - db = dbRule.getGraphDatabaseAPI(); - server = new GraphDatabaseShellServer( db ); - session.set( Variables.TITLE_KEYS_KEY, "name" ); - } - - @After - public void shutdown() throws Exception - { - server.shutdown(); - } } 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 b56d4617ddf88..fa22eb23425e7 100644 --- a/enterprise/backup/src/test/java/org/neo4j/backup/BackupEmbeddedIT.java +++ b/enterprise/backup/src/test/java/org/neo4j/backup/BackupEmbeddedIT.java @@ -19,11 +19,6 @@ */ package org.neo4j.backup; -import java.io.File; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.SystemUtils; import org.junit.Before; @@ -31,6 +26,11 @@ import org.junit.Rule; import org.junit.Test; +import java.io.File; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.RelationshipType; @@ -42,10 +42,10 @@ import org.neo4j.kernel.impl.factory.GraphDatabaseFacadeFactory; import org.neo4j.kernel.impl.store.format.highlimit.HighLimit; import org.neo4j.test.DbRepresentation; -import org.neo4j.test.EmbeddedDatabaseRule; import org.neo4j.test.ProcessStreamHandler; -import org.neo4j.test.SuppressOutput; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.EmbeddedDatabaseRule; +import org.neo4j.test.rule.SuppressOutput; +import org.neo4j.test.rule.TargetDirectory; import static org.junit.Assert.assertEquals; 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 b9c9618962559..f1e80ac1d6c7b 100644 --- a/enterprise/backup/src/test/java/org/neo4j/backup/BackupServiceIT.java +++ b/enterprise/backup/src/test/java/org/neo4j/backup/BackupServiceIT.java @@ -84,10 +84,10 @@ import org.neo4j.storageengine.api.StorageEngine; import org.neo4j.test.Barrier; import org.neo4j.test.DbRepresentation; -import org.neo4j.test.EmbeddedDatabaseRule; -import org.neo4j.test.PageCacheRule; -import org.neo4j.test.SuppressOutput; -import org.neo4j.test.TargetDirectory; +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 static java.util.concurrent.TimeUnit.SECONDS; import static org.hamcrest.CoreMatchers.containsString; 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 0fc07b67a0a3b..bc5a5712ddc65 100644 --- a/enterprise/backup/src/test/java/org/neo4j/backup/BackupToolTest.java +++ b/enterprise/backup/src/test/java/org/neo4j/backup/BackupToolTest.java @@ -19,22 +19,22 @@ */ package org.neo4j.backup; +import org.junit.Rule; +import org.junit.Test; +import org.mockito.ArgumentCaptor; + import java.io.File; import java.io.FileWriter; import java.io.IOException; import java.io.PrintStream; import java.util.Properties; -import org.junit.Rule; -import org.junit.Test; -import org.mockito.ArgumentCaptor; - import org.neo4j.consistency.ConsistencyCheckSettings; import org.neo4j.helpers.HostnamePort; import org.neo4j.kernel.configuration.Config; -import org.neo4j.test.SuppressOutput; -import org.neo4j.test.SystemExitRule; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.SuppressOutput; +import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.system.SystemExitRule; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.equalTo; 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 ad3d572f7d39c..b2fe2ed993f92 100644 --- a/enterprise/backup/src/test/java/org/neo4j/backup/IncrementalBackupTests.java +++ b/enterprise/backup/src/test/java/org/neo4j/backup/IncrementalBackupTests.java @@ -42,9 +42,9 @@ import org.neo4j.kernel.impl.factory.GraphDatabaseFacadeFactory; import org.neo4j.kernel.impl.store.format.highlimit.HighLimit; import org.neo4j.test.DbRepresentation; -import org.neo4j.test.SuppressOutput; -import org.neo4j.test.TargetDirectory; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.SuppressOutput; +import org.neo4j.test.rule.TargetDirectory; import static org.junit.Assert.assertEquals; 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 78fd962b52a7e..9a37a24eb5cc3 100644 --- a/enterprise/backup/src/test/java/org/neo4j/backup/TestBackup.java +++ b/enterprise/backup/src/test/java/org/neo4j/backup/TestBackup.java @@ -61,10 +61,10 @@ import org.neo4j.kernel.impl.storemigration.StoreFileType; import org.neo4j.kernel.impl.transaction.TransactionHeaderInformationFactory; import org.neo4j.test.DbRepresentation; -import org.neo4j.test.PageCacheRule; -import org.neo4j.test.SuppressOutput; -import org.neo4j.test.TargetDirectory; 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.subprocess.SubProcess; import static java.lang.Integer.parseInt; diff --git a/enterprise/backup/src/test/java/org/neo4j/backup/TestConfiguration.java b/enterprise/backup/src/test/java/org/neo4j/backup/TestConfiguration.java index b359f12619890..ac292e7c67079 100644 --- a/enterprise/backup/src/test/java/org/neo4j/backup/TestConfiguration.java +++ b/enterprise/backup/src/test/java/org/neo4j/backup/TestConfiguration.java @@ -30,8 +30,8 @@ import org.neo4j.kernel.configuration.Settings; import org.neo4j.kernel.impl.factory.GraphDatabaseFacadeFactory; import org.neo4j.kernel.impl.store.format.highlimit.HighLimit; -import org.neo4j.test.SuppressOutput; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.SuppressOutput; import static org.junit.Assert.fail; diff --git a/enterprise/cluster/src/test/java/org/neo4j/cluster/protocol/cluster/ClusterConfigurationTest.java b/enterprise/cluster/src/test/java/org/neo4j/cluster/protocol/cluster/ClusterConfigurationTest.java index 421296904140b..be88ff91850a6 100644 --- a/enterprise/cluster/src/test/java/org/neo4j/cluster/protocol/cluster/ClusterConfigurationTest.java +++ b/enterprise/cluster/src/test/java/org/neo4j/cluster/protocol/cluster/ClusterConfigurationTest.java @@ -19,9 +19,7 @@ */ package org.neo4j.cluster.protocol.cluster; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.junit.Assert.assertThat; -import static org.neo4j.test.IterableMatcher.matchesIterable; +import org.junit.Test; import java.net.URI; import java.net.URISyntaxException; @@ -29,11 +27,14 @@ import java.util.Arrays; import java.util.Collections; -import org.junit.Test; import org.neo4j.cluster.InstanceId; import org.neo4j.helpers.collection.Iterables; import org.neo4j.logging.NullLogProvider; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.junit.Assert.assertThat; +import static org.neo4j.test.mockito.matcher.IterableMatcher.matchesIterable; + public class ClusterConfigurationTest { public static URI NEO4J_SERVER1_URI; diff --git a/enterprise/cluster/src/test/java/org/neo4j/cluster/protocol/cluster/ClusterMockTest.java b/enterprise/cluster/src/test/java/org/neo4j/cluster/protocol/cluster/ClusterMockTest.java index 4e0f89cdf8ad0..ebf6a6bb47726 100644 --- a/enterprise/cluster/src/test/java/org/neo4j/cluster/protocol/cluster/ClusterMockTest.java +++ b/enterprise/cluster/src/test/java/org/neo4j/cluster/protocol/cluster/ClusterMockTest.java @@ -19,6 +19,9 @@ */ package org.neo4j.cluster.protocol.cluster; +import org.junit.After; +import org.junit.Rule; + import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; @@ -36,9 +39,6 @@ import java.util.concurrent.TimeoutException; import java.util.logging.Level; -import org.junit.After; -import org.junit.Rule; - import org.neo4j.cluster.FixedNetworkLatencyStrategy; import org.neo4j.cluster.InstanceId; import org.neo4j.cluster.MultipleFailureLatencyStrategy; @@ -62,7 +62,7 @@ import org.neo4j.helpers.collection.Iterables; import org.neo4j.kernel.impl.logging.NullLogService; import org.neo4j.kernel.monitoring.Monitors; -import org.neo4j.test.LoggerRule; +import org.neo4j.test.rule.LoggerRule; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/enterprise/cluster/src/test/java/org/neo4j/cluster/protocol/cluster/ClusterNetworkTest.java b/enterprise/cluster/src/test/java/org/neo4j/cluster/protocol/cluster/ClusterNetworkTest.java index a4efc56a5d447..eac122ab55b32 100644 --- a/enterprise/cluster/src/test/java/org/neo4j/cluster/protocol/cluster/ClusterNetworkTest.java +++ b/enterprise/cluster/src/test/java/org/neo4j/cluster/protocol/cluster/ClusterNetworkTest.java @@ -19,6 +19,13 @@ */ package org.neo4j.cluster.protocol.cluster; +import org.junit.After; +import org.junit.Before; +import org.junit.ClassRule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + import java.net.URI; import java.net.URISyntaxException; import java.util.ArrayList; @@ -38,13 +45,6 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.logging.Level; -import org.junit.After; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; - import org.neo4j.cluster.ClusterSettings; import org.neo4j.cluster.InstanceId; import org.neo4j.cluster.MultiPaxosServerFactory; @@ -63,7 +63,7 @@ import org.neo4j.kernel.lifecycle.LifeSupport; import org.neo4j.kernel.monitoring.Monitors; import org.neo4j.logging.NullLogProvider; -import org.neo4j.test.LoggerRule; +import org.neo4j.test.rule.LoggerRule; import static org.junit.Assert.assertEquals; diff --git a/enterprise/com/src/test/java/org/neo4j/com/storecopy/ResponsePackerIT.java b/enterprise/com/src/test/java/org/neo4j/com/storecopy/ResponsePackerIT.java index 79de421675474..b1fbf77ef3723 100644 --- a/enterprise/com/src/test/java/org/neo4j/com/storecopy/ResponsePackerIT.java +++ b/enterprise/com/src/test/java/org/neo4j/com/storecopy/ResponsePackerIT.java @@ -40,8 +40,8 @@ import org.neo4j.kernel.impl.transaction.log.LogicalTransactionStore; import org.neo4j.kernel.monitoring.Monitors; import org.neo4j.logging.NullLogProvider; -import org.neo4j.test.EphemeralFileSystemRule; -import org.neo4j.test.PageCacheRule; +import org.neo4j.test.rule.PageCacheRule; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; 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 cd02304d59736..62ecfab91ed9c 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 @@ -52,9 +52,9 @@ import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.monitoring.Monitors; import org.neo4j.logging.NullLogProvider; -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.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertNotNull; diff --git a/enterprise/core-edge/pom.xml b/enterprise/core-edge/pom.xml index 849eb84f0de52..045ea7d8c8e22 100644 --- a/enterprise/core-edge/pom.xml +++ b/enterprise/core-edge/pom.xml @@ -103,6 +103,14 @@ test + + org.neo4j + neo4j-com + ${project.version} + test-jar + test + + org.neo4j neo4j-enterprise-kernel diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/catchup/storecopy/LocalDatabaseTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/catchup/storecopy/LocalDatabaseTest.java index 4d08df92d33a3..c2eaae4a3ccb5 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/catchup/storecopy/LocalDatabaseTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/catchup/storecopy/LocalDatabaseTest.java @@ -22,7 +22,6 @@ import org.junit.Test; import java.io.File; -import java.util.function.Supplier; import org.neo4j.coreedge.catchup.storecopy.edge.CopiedStoreRecovery; import org.neo4j.io.fs.FileSystemAbstraction; @@ -34,8 +33,8 @@ import static junit.framework.TestCase.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.neo4j.function.Suppliers.singleton; import static org.neo4j.com.StoreIdTestFactory.newStoreIdForCurrentVersion; +import static org.neo4j.function.Suppliers.singleton; public class LocalDatabaseTest { diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/FilenameBasedLogVersionRepositoryTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/FilenameBasedLogVersionRepositoryTest.java index 5e12eb243f225..9b1fffb48e35a 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/FilenameBasedLogVersionRepositoryTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/FilenameBasedLogVersionRepositoryTest.java @@ -19,14 +19,15 @@ */ package org.neo4j.coreedge.raft.log; -import static org.junit.Assert.assertEquals; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - import org.junit.Rule; import org.junit.Test; + import org.neo4j.kernel.impl.transaction.log.PhysicalLogFiles; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; + +import static org.junit.Assert.assertEquals; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; public class FilenameBasedLogVersionRepositoryTest { diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/RaftLogDurabilityTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/RaftLogDurabilityTest.java index d2369e0f47de8..073b4a793a6d4 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/RaftLogDurabilityTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/RaftLogDurabilityTest.java @@ -19,17 +19,17 @@ */ package org.neo4j.coreedge.raft.log; -import java.io.File; -import java.io.IOException; -import java.util.Arrays; -import java.util.Collection; - import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import java.io.File; +import java.io.IOException; +import java.util.Arrays; +import java.util.Collection; + import org.neo4j.coreedge.raft.ReplicatedInteger; import org.neo4j.coreedge.raft.ReplicatedString; import org.neo4j.coreedge.raft.log.physical.PhysicalRaftLogFile; @@ -38,13 +38,12 @@ import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.kernel.internal.DatabaseHealth; import org.neo4j.logging.NullLogProvider; -import org.neo4j.test.EphemeralFileSystemRule; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.mock; - import static org.neo4j.coreedge.raft.ReplicatedInteger.valueOf; import static org.neo4j.coreedge.raft.log.RaftLogHelper.hasNoContent; import static org.neo4j.coreedge.raft.log.RaftLogHelper.readLogEntry; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/RaftLogVerificationIT.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/RaftLogVerificationIT.java index 53bfcf8c97ee4..21b968bde87fd 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/RaftLogVerificationIT.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/RaftLogVerificationIT.java @@ -26,7 +26,7 @@ import java.util.concurrent.ThreadLocalRandom; -import org.neo4j.test.EphemeralFileSystemRule; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static org.junit.Assert.assertEquals; import static org.neo4j.coreedge.raft.ReplicatedInteger.valueOf; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/physical/PhysicalRaftLogFileTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/physical/PhysicalRaftLogFileTest.java index 6cc96915ca95c..80b78e902fd82 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/physical/PhysicalRaftLogFileTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/physical/PhysicalRaftLogFileTest.java @@ -19,13 +19,13 @@ */ package org.neo4j.coreedge.raft.log.physical; +import org.junit.Rule; +import org.junit.Test; + import java.io.File; import java.io.IOException; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.Rule; -import org.junit.Test; - import org.neo4j.io.fs.DefaultFileSystemAbstraction; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.kernel.impl.transaction.DeadSimpleLogVersionRepository; @@ -43,14 +43,13 @@ import org.neo4j.kernel.impl.transaction.log.TransactionIdStore; import org.neo4j.kernel.impl.transaction.log.entry.LogHeader; import org.neo4j.kernel.lifecycle.LifeSupport; -import org.neo4j.test.TargetDirectory; -import org.neo4j.test.TargetDirectory.TestDirectory; +import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory.TestDirectory; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; - import static org.neo4j.kernel.impl.transaction.log.entry.LogHeaderReader.readLogHeader; public class PhysicalRaftLogFileTest diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/membership/RaftMembershipStateRecoveryManagerTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/membership/RaftMembershipStateRecoveryManagerTest.java index 2d13f7b37d52f..6431d90404641 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/membership/RaftMembershipStateRecoveryManagerTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/membership/RaftMembershipStateRecoveryManagerTest.java @@ -22,7 +22,7 @@ import org.junit.Rule; import org.junit.Test; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; public class RaftMembershipStateRecoveryManagerTest { diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/RaftReplicatorTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/RaftReplicatorTest.java index 746fde89f68da..dbf77ced04ba1 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/RaftReplicatorTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/RaftReplicatorTest.java @@ -43,7 +43,7 @@ import static org.hamcrest.Matchers.greaterThan; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.neo4j.test.Assert.assertEventually; +import static org.neo4j.test.assertion.Assert.assertEventually; public class RaftReplicatorTest { diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/id/StateRecoveryManagerTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/id/StateRecoveryManagerTest.java index 837c4ee055192..43474fad798eb 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/id/StateRecoveryManagerTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/id/StateRecoveryManagerTest.java @@ -19,14 +19,14 @@ */ package org.neo4j.coreedge.raft.replication.id; -import java.io.File; -import java.io.IOException; -import java.nio.ByteBuffer; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import java.io.File; +import java.io.IOException; +import java.nio.ByteBuffer; + import org.neo4j.coreedge.raft.state.StateMarshal; import org.neo4j.coreedge.raft.state.StateRecoveryManager; import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction; @@ -34,7 +34,7 @@ import org.neo4j.storageengine.api.ReadPastEndException; import org.neo4j.storageengine.api.ReadableChannel; import org.neo4j.storageengine.api.WritableChannel; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static org.junit.Assert.assertEquals; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/DurableStateStorageIT.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/DurableStateStorageIT.java index cb23fff6e2a4f..ffd19b00bf686 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/DurableStateStorageIT.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/DurableStateStorageIT.java @@ -19,14 +19,14 @@ */ package org.neo4j.coreedge.raft.state; +import org.junit.Rule; +import org.junit.Test; + import java.io.File; import java.io.IOException; import java.nio.ByteBuffer; import java.util.function.Supplier; -import org.junit.Rule; -import org.junit.Test; - import org.neo4j.adversaries.CountingAdversary; import org.neo4j.adversaries.MethodGuardedAdversary; import org.neo4j.adversaries.fs.AdversarialFileSystemAbstraction; @@ -34,15 +34,15 @@ import org.neo4j.graphdb.mockfs.SelectiveFileSystemAbstraction; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.fs.StoreChannel; -import org.neo4j.kernel.internal.KernelEventHandlers; import org.neo4j.kernel.impl.core.DatabasePanicEventGenerator; import org.neo4j.kernel.internal.DatabaseHealth; +import org.neo4j.kernel.internal.KernelEventHandlers; import org.neo4j.logging.NullLog; import org.neo4j.logging.NullLogProvider; import org.neo4j.storageengine.api.ReadPastEndException; import org.neo4j.storageengine.api.ReadableChannel; import org.neo4j.storageengine.api.WritableChannel; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.junit.Assert.assertEquals; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/DurableStateStorageTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/DurableStateStorageTest.java index aaf07ada1850c..883925a0b5561 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/DurableStateStorageTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/DurableStateStorageTest.java @@ -19,6 +19,9 @@ */ package org.neo4j.coreedge.raft.state; +import org.junit.Rule; +import org.junit.Test; + import java.io.File; import java.io.IOException; import java.nio.BufferUnderflowException; @@ -26,9 +29,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Supplier; -import org.junit.Rule; -import org.junit.Test; - import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction; import org.neo4j.io.fs.StoreChannel; import org.neo4j.kernel.internal.DatabaseHealth; @@ -36,7 +36,7 @@ import org.neo4j.storageengine.api.ReadPastEndException; import org.neo4j.storageengine.api.ReadableChannel; import org.neo4j.storageengine.api.WritableChannel; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/ClusterFormationIT.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/ClusterFormationIT.java index 799bcf64a8911..f16fbe8ee335a 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/ClusterFormationIT.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/ClusterFormationIT.java @@ -19,18 +19,18 @@ */ package org.neo4j.coreedge.scenarios; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; - import org.junit.After; import org.junit.Rule; import org.junit.Test; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; + import org.neo4j.coreedge.discovery.Cluster; import org.neo4j.coreedge.raft.roles.Role; import org.neo4j.coreedge.server.core.CoreGraphDatabase; import org.neo4j.graphdb.Transaction; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static org.junit.Assert.assertEquals; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/ClusterShutdownIT.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/ClusterShutdownIT.java index c7d6a3d87ba4c..6f5ebaf8a09f8 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/ClusterShutdownIT.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/ClusterShutdownIT.java @@ -19,6 +19,10 @@ */ package org.neo4j.coreedge.scenarios; +import org.junit.Ignore; +import org.junit.Rule; +import org.junit.Test; + import java.io.File; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; @@ -26,19 +30,14 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; -import org.junit.Ignore; -import org.junit.Rule; -import org.junit.Test; - import org.neo4j.coreedge.discovery.Cluster; import org.neo4j.coreedge.discovery.TestOnlyDiscoveryServiceFactory; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static java.util.concurrent.TimeUnit.MILLISECONDS; - import static junit.framework.TestCase.fail; @Ignore diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/ConcurrentLockingIT.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/ConcurrentLockingIT.java index 37e75f125c9cf..0b0a4c68736e5 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/ConcurrentLockingIT.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/ConcurrentLockingIT.java @@ -41,14 +41,14 @@ import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static java.util.concurrent.TimeUnit.SECONDS; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; import static org.neo4j.helpers.collection.Iterables.count; -import static org.neo4j.test.Assert.assertEventually; +import static org.neo4j.test.assertion.Assert.assertEventually; @Ignore("Currently we only support writing on the leader") public class ConcurrentLockingIT diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/ConvertNonCoreEdgeStoreIT.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/ConvertNonCoreEdgeStoreIT.java index d62ec5e4352ba..1ea36e99f66c9 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/ConvertNonCoreEdgeStoreIT.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/ConvertNonCoreEdgeStoreIT.java @@ -40,14 +40,14 @@ import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.factory.GraphDatabaseFacadeFactory; import org.neo4j.kernel.impl.store.format.highlimit.HighLimit; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static java.util.concurrent.TimeUnit.SECONDS; import static org.hamcrest.Matchers.greaterThan; import static org.neo4j.coreedge.server.CoreEdgeClusterSettings.raft_advertised_address; import static org.neo4j.graphdb.Label.label; import static org.neo4j.helpers.collection.Iterables.count; -import static org.neo4j.test.Assert.assertEventually; +import static org.neo4j.test.assertion.Assert.assertEventually; public class ConvertNonCoreEdgeStoreIT { diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/CoreEdgeRolesIT.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/CoreEdgeRolesIT.java index f2032e7ae966b..9434cb0591c22 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/CoreEdgeRolesIT.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/CoreEdgeRolesIT.java @@ -28,7 +28,7 @@ import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.TransactionFailureException; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; public class CoreEdgeRolesIT { diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/CoreServerReplicationIT.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/CoreServerReplicationIT.java index 2667db68b5fdc..f6e0ada3d813d 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/CoreServerReplicationIT.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/CoreServerReplicationIT.java @@ -34,7 +34,7 @@ import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; import org.neo4j.test.DbRepresentation; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static org.junit.Assert.assertEquals; import static org.neo4j.graphdb.Label.label; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/CoreToCoreCopySnapshotIT.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/CoreToCoreCopySnapshotIT.java index a968b9da573a0..a4d2e42d16d8f 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/CoreToCoreCopySnapshotIT.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/CoreToCoreCopySnapshotIT.java @@ -35,7 +35,7 @@ import org.neo4j.graphdb.Relationship; import org.neo4j.graphdb.RelationshipType; import org.neo4j.test.DbRepresentation; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static junit.framework.TestCase.assertEquals; import static org.neo4j.helpers.collection.MapUtil.stringMap; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/EdgeServerReplicationIT.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/EdgeServerReplicationIT.java index e9935ff754b2a..d50fcac270a1a 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/EdgeServerReplicationIT.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/EdgeServerReplicationIT.java @@ -19,14 +19,14 @@ */ package org.neo4j.coreedge.scenarios; -import java.io.File; -import java.util.Set; -import java.util.concurrent.TimeoutException; - import org.junit.After; import org.junit.Rule; import org.junit.Test; +import java.io.File; +import java.util.Set; +import java.util.concurrent.TimeoutException; + import org.neo4j.coreedge.discovery.Cluster; import org.neo4j.coreedge.server.core.CoreGraphDatabase; import org.neo4j.coreedge.server.edge.EdgeGraphDatabase; @@ -36,20 +36,18 @@ import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.TransactionFailureException; -import org.neo4j.test.TargetDirectory; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.TargetDirectory; import static java.io.File.pathSeparator; import static java.util.concurrent.TimeUnit.MINUTES; import static java.util.concurrent.TimeUnit.SECONDS; - import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; - import static org.neo4j.helpers.collection.Iterables.count; -import static org.neo4j.test.Assert.assertEventually; +import static org.neo4j.test.assertion.Assert.assertEventually; public class EdgeServerReplicationIT { diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/RecoveryIT.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/RecoveryIT.java index 6c09efd71e849..6c19c9fbf33a9 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/RecoveryIT.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/RecoveryIT.java @@ -19,16 +19,16 @@ */ package org.neo4j.coreedge.scenarios; -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashSet; - import org.junit.After; import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashSet; + import org.neo4j.consistency.ConsistencyCheckService; import org.neo4j.consistency.checking.full.ConsistencyCheckIncompleteException; import org.neo4j.coreedge.discovery.Cluster; @@ -39,13 +39,11 @@ import org.neo4j.helpers.progress.ProgressMonitorFactory; import org.neo4j.kernel.configuration.Config; import org.neo4j.logging.FormattedLogProvider; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.locks.LockSupport.parkNanos; - import static org.junit.Assert.assertTrue; - import static org.neo4j.graphdb.Label.label; @Ignore("in progress") diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/RestartIT.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/RestartIT.java index c1ece67b3cd2f..a04e961dd83f0 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/RestartIT.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/RestartIT.java @@ -39,7 +39,7 @@ import org.neo4j.io.fs.DefaultFileSystemAbstraction; import org.neo4j.kernel.configuration.Config; import org.neo4j.logging.FormattedLogProvider; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static org.junit.Assert.assertTrue; import static org.neo4j.graphdb.Label.label; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/server/core/locks/ReplicatedLockTokenStateMachineTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/server/core/locks/ReplicatedLockTokenStateMachineTest.java index d6bd2cbc5da26..fe964f4d4080b 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/server/core/locks/ReplicatedLockTokenStateMachineTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/server/core/locks/ReplicatedLockTokenStateMachineTest.java @@ -32,7 +32,7 @@ import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction; import org.neo4j.kernel.internal.DatabaseHealth; import org.neo4j.logging.NullLogProvider; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; diff --git a/enterprise/ha/src/test/java/jmx/JmxDocTest.java b/enterprise/ha/src/test/java/jmx/JmxDocTest.java index f23bdc95de553..e84b5de77be68 100644 --- a/enterprise/ha/src/test/java/jmx/JmxDocTest.java +++ b/enterprise/ha/src/test/java/jmx/JmxDocTest.java @@ -52,10 +52,10 @@ import org.neo4j.graphdb.factory.GraphDatabaseBuilder; import org.neo4j.graphdb.factory.TestHighlyAvailableGraphDatabaseFactory; import org.neo4j.helpers.collection.Iterators; -import org.neo4j.kernel.configuration.docs.SettingDescription; import org.neo4j.kernel.configuration.docs.AsciiDocListGenerator; +import org.neo4j.kernel.configuration.docs.SettingDescription; import org.neo4j.test.AsciiDocGenerator; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static org.junit.Assert.assertEquals; diff --git a/enterprise/ha/src/test/java/org/neo4j/ha/BackupHaIT.java b/enterprise/ha/src/test/java/org/neo4j/ha/BackupHaIT.java index f0731c1f38780..4a16d8e96558a 100644 --- a/enterprise/ha/src/test/java/org/neo4j/ha/BackupHaIT.java +++ b/enterprise/ha/src/test/java/org/neo4j/ha/BackupHaIT.java @@ -36,8 +36,8 @@ import org.neo4j.kernel.impl.ha.ClusterManager.ManagedCluster; import org.neo4j.kernel.impl.store.format.highlimit.HighLimit; import org.neo4j.test.DbRepresentation; -import org.neo4j.test.SuppressOutput; import org.neo4j.test.ha.ClusterRule; +import org.neo4j.test.rule.SuppressOutput; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; 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 577bbf1446f4a..1de959c78636f 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.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; diff --git a/enterprise/ha/src/test/java/org/neo4j/ha/PullStormIT.java b/enterprise/ha/src/test/java/org/neo4j/ha/PullStormIT.java index 04de3c4a9ddaf..e31300dac4fb3 100644 --- a/enterprise/ha/src/test/java/org/neo4j/ha/PullStormIT.java +++ b/enterprise/ha/src/test/java/org/neo4j/ha/PullStormIT.java @@ -34,8 +34,8 @@ import org.neo4j.kernel.impl.ha.ClusterManager; import org.neo4j.kernel.impl.ha.ClusterManager.ManagedCluster; import org.neo4j.kernel.impl.transaction.log.TransactionIdStore; -import org.neo4j.test.LoggerRule; import org.neo4j.test.ha.ClusterRule; +import org.neo4j.test.rule.LoggerRule; import static org.junit.Assert.assertEquals; 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 317d6a6d3d413..740b9362360da 100644 --- a/enterprise/ha/src/test/java/org/neo4j/ha/QuorumWritesIT.java +++ b/enterprise/ha/src/test/java/org/neo4j/ha/QuorumWritesIT.java @@ -44,8 +44,8 @@ import org.neo4j.kernel.impl.ha.ClusterManager; import org.neo4j.kernel.impl.ha.ClusterManager.ManagedCluster; import org.neo4j.kernel.impl.store.StoreId; -import org.neo4j.test.TargetDirectory; import org.neo4j.test.ha.ClusterRule; +import org.neo4j.test.rule.TargetDirectory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; 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 af350d28804a9..5136180b79374 100644 --- a/enterprise/ha/src/test/java/org/neo4j/ha/TestBranchedData.java +++ b/enterprise/ha/src/test/java/org/neo4j/ha/TestBranchedData.java @@ -51,9 +51,9 @@ import org.neo4j.kernel.impl.util.Listener; import org.neo4j.kernel.impl.util.StoreUtil; import org.neo4j.kernel.lifecycle.LifeRule; -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 static java.lang.String.format; import static org.junit.Assert.assertFalse; 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 10f2a77bb2150..25fe44eb8935e 100644 --- a/enterprise/ha/src/test/java/org/neo4j/ha/TestPullUpdates.java +++ b/enterprise/ha/src/test/java/org/neo4j/ha/TestPullUpdates.java @@ -40,16 +40,16 @@ import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.factory.TestHighlyAvailableGraphDatabaseFactory; import org.neo4j.helpers.collection.MapUtil; -import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.ha.HaSettings; import org.neo4j.kernel.ha.HighlyAvailableGraphDatabase; import org.neo4j.kernel.impl.ha.ClusterManager; import org.neo4j.kernel.impl.logging.LogService; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.shell.ShellClient; import org.neo4j.shell.ShellException; import org.neo4j.shell.ShellLobby; import org.neo4j.shell.ShellSettings; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static java.lang.System.currentTimeMillis; import static org.junit.Assert.assertEquals; 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 d701d158534bd..f93ba5ef05a23 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.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/enterprise/ha/src/test/java/org/neo4j/ha/TransactionConstraintsIT.java b/enterprise/ha/src/test/java/org/neo4j/ha/TransactionConstraintsIT.java index 51025d5555ea7..5715031d29759 100644 --- a/enterprise/ha/src/test/java/org/neo4j/ha/TransactionConstraintsIT.java +++ b/enterprise/ha/src/test/java/org/neo4j/ha/TransactionConstraintsIT.java @@ -26,6 +26,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.junit.rules.RuleChain; import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; @@ -47,10 +48,10 @@ import org.neo4j.kernel.ha.HighlyAvailableGraphDatabase; import org.neo4j.kernel.impl.MyRelTypes; import org.neo4j.kernel.impl.ha.ClusterManager; -import org.neo4j.qa.tooling.DumpProcessInformationRule; import org.neo4j.test.OtherThreadExecutor; import org.neo4j.test.OtherThreadExecutor.WorkerCommand; import org.neo4j.test.ha.ClusterRule; +import org.neo4j.test.rule.dump.DumpProcessInformationRule; import static java.lang.System.currentTimeMillis; import static java.util.concurrent.TimeUnit.MINUTES; @@ -62,7 +63,7 @@ import static org.junit.Assert.fail; import static org.neo4j.kernel.impl.ha.ClusterManager.allSeesAllAsAvailable; import static org.neo4j.kernel.impl.ha.ClusterManager.masterAvailable; -import static org.neo4j.qa.tooling.DumpProcessInformationRule.localVm; +import static org.neo4j.test.rule.dump.DumpProcessInformationRule.localVm; public class TransactionConstraintsIT { @@ -73,8 +74,11 @@ public class TransactionConstraintsIT .withSharedSetting( HaSettings.pull_interval, "0" ) .withInstanceSetting( HaSettings.slave_only, (serverId) -> serverId == SLAVE_ONLY_ID ? "true" : "false" ); + private DumpProcessInformationRule dumpInfo = new DumpProcessInformationRule( 1, MINUTES, localVm( System.out ) ); + private ExpectedException exception = ExpectedException.none(); + @Rule - public ExpectedException exception = ExpectedException.none(); + public RuleChain ruleChain = RuleChain.outerRule( dumpInfo ).around( exception ); protected ClusterManager.ManagedCluster cluster; @@ -513,9 +517,6 @@ public Lock doWork( HighlyAvailableGraphDatabase state ) throws Exception } } - @Rule - public DumpProcessInformationRule dumpInfo = new DumpProcessInformationRule( 1, MINUTES, localVm( System.out ) ); - private void awaitFullyOperational( GraphDatabaseService db ) throws InterruptedException { long endTime = currentTimeMillis() + MINUTES.toMillis( 1 ); diff --git a/enterprise/ha/src/test/java/org/neo4j/ha/UniquenessConstraintValidationHAIT.java b/enterprise/ha/src/test/java/org/neo4j/ha/UniquenessConstraintValidationHAIT.java index d7f5b0de3342f..657bb5c49f6cc 100644 --- a/enterprise/ha/src/test/java/org/neo4j/ha/UniquenessConstraintValidationHAIT.java +++ b/enterprise/ha/src/test/java/org/neo4j/ha/UniquenessConstraintValidationHAIT.java @@ -31,16 +31,15 @@ import org.neo4j.kernel.ha.HighlyAvailableGraphDatabase; import org.neo4j.kernel.impl.ha.ClusterManager; import org.neo4j.kernel.impl.util.Listener; -import org.neo4j.test.OtherThreadRule; import org.neo4j.test.ha.ClusterRule; +import org.neo4j.test.rule.concurrent.OtherThreadRule; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.neo4j.graphdb.Label.label; - import static org.neo4j.kernel.impl.api.integrationtest.UniquenessConstraintValidationConcurrencyIT.createNode; -import static org.neo4j.test.OtherThreadRule.isWaiting; +import static org.neo4j.test.rule.concurrent.OtherThreadRule.isWaiting; public class UniquenessConstraintValidationHAIT { 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 e0e05ac822b9c..0e3286a04ee11 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 @@ -51,10 +51,10 @@ import org.neo4j.helpers.collection.MapUtil; import org.neo4j.helpers.collection.Pair; import org.neo4j.io.fs.FileUtils; -import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.ha.UpdatePuller; -import org.neo4j.test.TargetDirectory; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.TargetDirectory; import static java.util.concurrent.TimeUnit.MINUTES; import static org.junit.Assert.assertTrue; 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 9fa545ad45dfa..6fd567dfaca4e 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 @@ -37,8 +37,8 @@ import org.neo4j.kernel.impl.ha.ClusterManager.ManagedCluster; import org.neo4j.kernel.impl.store.format.highlimit.HighLimit; import org.neo4j.kernel.lifecycle.LifeSupport; -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.assertTrue; diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/ClusterTopologyChangesIT.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/ClusterTopologyChangesIT.java index 58861d08c4ede..23e2d08d0044c 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/ClusterTopologyChangesIT.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/ClusterTopologyChangesIT.java @@ -19,17 +19,16 @@ */ package org.neo4j.kernel.ha; -import java.net.UnknownHostException; -import java.util.Map; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicReference; - import org.junit.Before; import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; +import java.util.Map; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicReference; + import org.neo4j.cluster.ClusterSettings; import org.neo4j.cluster.InstanceId; import org.neo4j.cluster.client.ClusterClient; @@ -54,10 +53,10 @@ import org.neo4j.kernel.lifecycle.LifeSupport; import org.neo4j.kernel.monitoring.Monitors; import org.neo4j.logging.FormattedLogProvider; -import org.neo4j.test.CleanupRule; import org.neo4j.test.RepeatRule; -import org.neo4j.test.SuppressOutput; import org.neo4j.test.ha.ClusterRule; +import org.neo4j.test.rule.CleanupRule; +import org.neo4j.test.rule.SuppressOutput; import static java.util.concurrent.TimeUnit.SECONDS; import static org.junit.Assert.assertEquals; 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 32285317f33c2..358fe1f8ac21b 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.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static org.junit.Assert.assertTrue; 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 ed03168af8fa7..cd8ae5df50e68 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.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; 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 438a7d92b534c..2d2c04b635ae7 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.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static java.util.concurrent.TimeUnit.SECONDS; import static org.junit.Assert.assertEquals; diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/OnDiskLastTxIdGetterTest.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/OnDiskLastTxIdGetterTest.java index 26b68d41e081f..8f3a3e5bdb154 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/OnDiskLastTxIdGetterTest.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/OnDiskLastTxIdGetterTest.java @@ -31,8 +31,8 @@ import org.neo4j.kernel.impl.store.format.RecordFormatSelector; import org.neo4j.kernel.impl.transaction.log.TransactionIdStore; import org.neo4j.logging.NullLogProvider; -import org.neo4j.test.EphemeralFileSystemRule; -import org.neo4j.test.PageCacheRule; +import org.neo4j.test.rule.PageCacheRule; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static org.junit.Assert.assertEquals; diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/PropertyConstraintsStressIT.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/PropertyConstraintsStressIT.java index d410054843a41..398f42dcbf478 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/PropertyConstraintsStressIT.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/PropertyConstraintsStressIT.java @@ -46,10 +46,10 @@ import org.neo4j.kernel.api.exceptions.schema.ConstraintVerificationFailedKernelException; import org.neo4j.kernel.impl.ha.ClusterManager; import org.neo4j.test.OtherThreadExecutor.WorkerCommand; -import org.neo4j.test.OtherThreadRule; import org.neo4j.test.RepeatRule; -import org.neo4j.test.SuppressOutput; import org.neo4j.test.ha.ClusterRule; +import org.neo4j.test.rule.SuppressOutput; +import org.neo4j.test.rule.concurrent.OtherThreadRule; import static java.lang.String.format; import static org.hamcrest.Matchers.equalTo; diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/SlaveUpdatePullerTest.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/SlaveUpdatePullerTest.java index 7cbf8ba13c306..540a9a37563b8 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/SlaveUpdatePullerTest.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/SlaveUpdatePullerTest.java @@ -19,7 +19,6 @@ */ package org.neo4j.kernel.ha; -import org.hamcrest.Matcher; import org.junit.After; import org.junit.Before; import org.junit.Rule; @@ -42,15 +41,13 @@ import org.neo4j.kernel.ha.com.RequestContextFactory; import org.neo4j.kernel.ha.com.master.InvalidEpochException; import org.neo4j.kernel.ha.com.master.Master; -import org.neo4j.kernel.ha.com.master.Slave; import org.neo4j.kernel.ha.com.slave.InvalidEpochExceptionHandler; import org.neo4j.kernel.impl.util.CountingJobScheduler; import org.neo4j.kernel.impl.util.JobScheduler; import org.neo4j.kernel.impl.util.Neo4jJobScheduler; import org.neo4j.logging.AssertableLogProvider; -import org.neo4j.test.CleanupRule; +import org.neo4j.test.rule.CleanupRule; -import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.sameInstance; import static org.junit.Assert.assertFalse; @@ -59,7 +56,6 @@ import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyLong; -import static org.mockito.Matchers.contains; import static org.mockito.Mockito.RETURNS_MOCKS; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; 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 2dd79e307db15..dc597186e8ead 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.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static org.hamcrest.CoreMatchers.instanceOf; import static org.junit.Assert.assertThat; diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/TestBasicHaOperations.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/TestBasicHaOperations.java index 3e3399aed69e2..e4999e6a53f4b 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/TestBasicHaOperations.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/TestBasicHaOperations.java @@ -29,8 +29,8 @@ import org.neo4j.kernel.impl.ha.ClusterManager; import org.neo4j.kernel.impl.ha.ClusterManager.ManagedCluster; import org.neo4j.kernel.impl.ha.ClusterManager.RepairKit; -import org.neo4j.test.LoggerRule; import org.neo4j.test.ha.ClusterRule; +import org.neo4j.test.rule.LoggerRule; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/TestFailover.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/TestFailover.java index ab048b8ceebf6..63c908c4f6272 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/TestFailover.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/TestFailover.java @@ -19,19 +19,19 @@ */ package org.neo4j.kernel.ha; -import java.util.Arrays; -import java.util.Collection; - import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import java.util.Arrays; +import java.util.Collection; + import org.neo4j.cluster.ClusterSettings; import org.neo4j.kernel.impl.ha.ClusterManager; -import org.neo4j.test.LoggerRule; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.LoggerRule; +import org.neo4j.test.rule.TargetDirectory; import static org.neo4j.helpers.collection.MapUtil.stringMap; diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/TestFailoverWithAdditionalSlaveFailures.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/TestFailoverWithAdditionalSlaveFailures.java index aba9ac7c4c31c..5fd9f0ff9ef9b 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/TestFailoverWithAdditionalSlaveFailures.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/TestFailoverWithAdditionalSlaveFailures.java @@ -19,23 +19,23 @@ */ package org.neo4j.kernel.ha; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; - import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; + import org.neo4j.cluster.ClusterSettings; import org.neo4j.kernel.impl.ha.ClusterManager; import org.neo4j.kernel.impl.ha.ClusterManager.NetworkFlag; import org.neo4j.kernel.impl.ha.ClusterManager.RepairKit; -import org.neo4j.test.LoggerRule; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.LoggerRule; +import org.neo4j.test.rule.TargetDirectory; import static org.neo4j.helpers.collection.MapUtil.stringMap; import static org.neo4j.kernel.impl.ha.ClusterManager.allSeesAllAsAvailable; diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/TestMasterCommittingAtSlave.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/TestMasterCommittingAtSlave.java index b00190f1420fc..f7a66c2b5b0fd 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/TestMasterCommittingAtSlave.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/TestMasterCommittingAtSlave.java @@ -49,7 +49,7 @@ import org.neo4j.logging.AssertableLogProvider; import org.neo4j.logging.AssertableLogProvider.LogMatcher; import org.neo4j.logging.NullLog; -import org.neo4j.test.CleanupRule; +import org.neo4j.test.rule.CleanupRule; import static org.hamcrest.Matchers.any; import static org.hamcrest.Matchers.containsString; @@ -65,7 +65,10 @@ public class TestMasterCommittingAtSlave { + @Rule + public final CleanupRule cleanup = new CleanupRule(); private static final int MasterServerId = 0; + private static final FileSystemAbstraction FS = new DefaultFileSystemAbstraction(); private Iterable slaves; private AssertableLogProvider logProvider = new AssertableLogProvider(); @@ -255,9 +258,6 @@ private Iterable instantiateSlaves( int count, boolean[] failingSlaves ) return slaves; } - private static final FileSystemAbstraction FS = new DefaultFileSystemAbstraction(); - public final @Rule CleanupRule cleanup = new CleanupRule(); - private static class FakeSlave implements Slave { private volatile Queue calledWithTxId = new LinkedList(); diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/TxPushStrategyConfigIT.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/TxPushStrategyConfigIT.java index 676b9140f13a3..2099b05d8676d 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/TxPushStrategyConfigIT.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/TxPushStrategyConfigIT.java @@ -30,11 +30,11 @@ import org.neo4j.cluster.InstanceId; import org.neo4j.helpers.TransactionTemplate; -import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.impl.ha.ClusterManager.ManagedCluster; import org.neo4j.kernel.impl.transaction.log.TransactionIdStore; -import org.neo4j.test.SuppressOutput; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.test.ha.ClusterRule; +import org.neo4j.test.rule.SuppressOutput; import static java.lang.Math.max; import static java.lang.Math.min; diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/com/master/ConversationTest.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/com/master/ConversationTest.java index 3ee18d73325b2..19cf6e59f67af 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/com/master/ConversationTest.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/com/master/ConversationTest.java @@ -30,7 +30,7 @@ import java.util.concurrent.TimeUnit; import org.neo4j.kernel.impl.locking.Locks; -import org.neo4j.test.ThreadingRule; +import org.neo4j.test.rule.concurrent.ThreadingRule; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/com/master/MasterImplConversationStopFuzzIT.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/com/master/MasterImplConversationStopFuzzIT.java index a3dcb257e796c..4180b30250195 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/com/master/MasterImplConversationStopFuzzIT.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/com/master/MasterImplConversationStopFuzzIT.java @@ -63,7 +63,7 @@ import org.neo4j.kernel.lifecycle.LifeSupport; import org.neo4j.kernel.monitoring.Monitors; import org.neo4j.logging.FormattedLog; -import org.neo4j.test.rules.VerboseTimeout; +import org.neo4j.test.rule.VerboseTimeout; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/com/master/MasterImplTest.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/com/master/MasterImplTest.java index 5aa380b21cde0..fcdfd9cb4be49 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/com/master/MasterImplTest.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/com/master/MasterImplTest.java @@ -49,7 +49,7 @@ import org.neo4j.kernel.impl.transaction.log.TransactionIdStore; import org.neo4j.storageengine.api.lock.ResourceType; import org.neo4j.test.OtherThreadExecutor.WorkerCommand; -import org.neo4j.test.OtherThreadRule; +import org.neo4j.test.rule.concurrent.OtherThreadRule; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.Matchers.instanceOf; 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 92325813827a9..b30a9b682e85f 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.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static org.junit.Assert.assertSame; 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 9492baa6656f0..1c03a0dcd0d1c 100644 --- a/enterprise/ha/src/test/java/org/neo4j/test/ManagedResource.java +++ b/enterprise/ha/src/test/java/org/neo4j/test/ManagedResource.java @@ -23,6 +23,8 @@ import org.junit.runner.Description; import org.junit.runners.model.Statement; +import org.neo4j.test.rule.TargetDirectory; + public abstract class ManagedResource implements TestRule { private R resource; 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 2a51f9238d464..eb5b1565629ad 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 @@ -42,7 +42,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.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static org.neo4j.cluster.ClusterSettings.default_timeout; import static org.neo4j.graphdb.factory.GraphDatabaseSettings.pagecache_memory; 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 5eca9f572902d..08123372277a6 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 @@ -37,8 +37,8 @@ import org.neo4j.kernel.ha.HaSettings; import org.neo4j.kernel.ha.HighlyAvailableGraphDatabase; import org.neo4j.kernel.impl.ha.ClusterManager; -import org.neo4j.test.LoggerRule; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.LoggerRule; +import org.neo4j.test.rule.TargetDirectory; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; diff --git a/enterprise/ha/src/test/java/slavetest/TestInstanceJoin.java b/enterprise/ha/src/test/java/slavetest/TestInstanceJoin.java index 0f93439216a7a..baea960634095 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.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static org.junit.Assert.assertEquals; import static org.neo4j.graphdb.factory.GraphDatabaseSettings.keep_logical_logs; diff --git a/enterprise/kernel/src/test/java/org/neo4j/graphdb/SchemaWithPECAcceptanceTest.java b/enterprise/kernel/src/test/java/org/neo4j/graphdb/SchemaWithPECAcceptanceTest.java index 05889ee7be2d9..19dfe688f338e 100644 --- a/enterprise/kernel/src/test/java/org/neo4j/graphdb/SchemaWithPECAcceptanceTest.java +++ b/enterprise/kernel/src/test/java/org/neo4j/graphdb/SchemaWithPECAcceptanceTest.java @@ -24,17 +24,17 @@ import org.junit.Test; import org.neo4j.SchemaHelper; -import org.neo4j.graphdb.factory.EnterpriseDatabaseRule; import org.neo4j.graphdb.schema.ConstraintDefinition; import org.neo4j.kernel.impl.coreapi.schema.InternalSchemaActions; import org.neo4j.kernel.impl.coreapi.schema.NodePropertyExistenceConstraintDefinition; import org.neo4j.kernel.impl.coreapi.schema.RelationshipPropertyExistenceConstraintDefinition; import org.neo4j.kernel.impl.coreapi.schema.UniquenessConstraintDefinition; +import org.neo4j.test.rule.EnterpriseDatabaseRule; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.mock; -import static org.neo4j.graphdb.Neo4jMatchers.containsOnly; -import static org.neo4j.graphdb.Neo4jMatchers.getConstraints; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.containsOnly; +import static org.neo4j.test.mockito.matcher.Neo4jMatchers.getConstraints; public class SchemaWithPECAcceptanceTest { 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 d29719c413c87..8b556b9c00987 100644 --- a/enterprise/kernel/src/test/java/org/neo4j/graphdb/StartupConstraintSemanticsTest.java +++ b/enterprise/kernel/src/test/java/org/neo4j/graphdb/StartupConstraintSemanticsTest.java @@ -26,15 +26,17 @@ import org.neo4j.graphdb.factory.GraphDatabaseFactory; import org.neo4j.helpers.Exceptions; import org.neo4j.kernel.impl.constraints.StandardConstraintSemantics; + import org.neo4j.kernel.impl.factory.GraphDatabaseFacadeFactory; import org.neo4j.kernel.impl.store.format.highlimit.HighLimit; -import org.neo4j.test.TargetDirectory; + +import org.neo4j.test.rule.TargetDirectory; 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.TargetDirectory.testDirForTest; +import static org.neo4j.test.rule.TargetDirectory.testDirForTest; public class StartupConstraintSemanticsTest { diff --git a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/PropertyExistenceConstraintVerificationIT.java b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/PropertyExistenceConstraintVerificationIT.java index 7b0daab6a2505..0732b8ed8faaf 100644 --- a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/PropertyExistenceConstraintVerificationIT.java +++ b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/PropertyExistenceConstraintVerificationIT.java @@ -34,12 +34,12 @@ import org.neo4j.graphdb.QueryExecutionException; import org.neo4j.graphdb.Relationship; import org.neo4j.graphdb.Transaction; -import org.neo4j.graphdb.factory.EnterpriseDatabaseRule; import org.neo4j.kernel.api.exceptions.ConstraintViolationTransactionFailureException; import org.neo4j.kernel.api.exceptions.schema.CreateConstraintFailureException; import org.neo4j.kernel.impl.api.OperationsFacade; -import org.neo4j.test.DatabaseRule; -import org.neo4j.test.ThreadingRule; +import org.neo4j.test.rule.DatabaseRule; +import org.neo4j.test.rule.EnterpriseDatabaseRule; +import org.neo4j.test.rule.concurrent.ThreadingRule; import static java.util.concurrent.TimeUnit.SECONDS; import static org.hamcrest.CoreMatchers.instanceOf; @@ -49,8 +49,11 @@ import static org.junit.runners.Suite.SuiteClasses; import static org.neo4j.graphdb.Label.label; import static org.neo4j.graphdb.RelationshipType.withName; -import static org.neo4j.kernel.impl.api.integrationtest.PropertyExistenceConstraintVerificationIT.*; -import static org.neo4j.test.ThreadingRule.waitingWhileIn; +import static org.neo4j.kernel.impl.api.integrationtest.PropertyExistenceConstraintVerificationIT + .NodePropertyExistenceExistenceConstrainVerificationIT; +import static org.neo4j.kernel.impl.api.integrationtest.PropertyExistenceConstraintVerificationIT + .RelationshipPropertyExistenceExistenceConstrainVerificationIT; +import static org.neo4j.test.rule.concurrent.ThreadingRule.waitingWhileIn; @RunWith( Suite.class ) @SuiteClasses( { diff --git a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/enterprise/lock/forseti/ForsetiServiceLoadingTest.java b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/enterprise/lock/forseti/ForsetiServiceLoadingTest.java index 03114fab83220..55fbabeeefcde 100644 --- a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/enterprise/lock/forseti/ForsetiServiceLoadingTest.java +++ b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/enterprise/lock/forseti/ForsetiServiceLoadingTest.java @@ -22,11 +22,11 @@ import org.junit.Rule; import org.junit.Test; -import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.impl.factory.GraphDatabaseFacadeFactory; import org.neo4j.kernel.impl.locking.Locks; import org.neo4j.kernel.impl.locking.community.CommunityLockManger; -import org.neo4j.test.EmbeddedDatabaseRule; +import org.neo4j.kernel.internal.GraphDatabaseAPI; +import org.neo4j.test.rule.EmbeddedDatabaseRule; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.IsInstanceOf.instanceOf; diff --git a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/store/format/highlimit/ReferenceTest.java b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/store/format/highlimit/ReferenceTest.java index c5c81fd821a6b..b4b25f7eed405 100644 --- a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/store/format/highlimit/ReferenceTest.java +++ b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/store/format/highlimit/ReferenceTest.java @@ -25,7 +25,7 @@ import java.io.IOException; import org.neo4j.io.pagecache.StubPageCursor; -import org.neo4j.test.RandomRule; +import org.neo4j.test.rule.RandomRule; import static org.junit.Assert.assertEquals; import static org.neo4j.kernel.impl.store.format.highlimit.Reference.PAGE_CURSOR_ADAPTER; diff --git a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/store/format/highlimit/SecondaryPageCursorReadDataAdapterTest.java b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/store/format/highlimit/SecondaryPageCursorReadDataAdapterTest.java index 0e43b4aae4f48..d5fffd81a9934 100644 --- a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/store/format/highlimit/SecondaryPageCursorReadDataAdapterTest.java +++ b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/store/format/highlimit/SecondaryPageCursorReadDataAdapterTest.java @@ -28,7 +28,7 @@ import org.neo4j.io.pagecache.PageCursor; import org.neo4j.io.pagecache.PagedFile; import org.neo4j.io.pagecache.StubPageCursor; -import org.neo4j.test.RandomRule; +import org.neo4j.test.rule.RandomRule; import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.anyInt; 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 ea116dda93ba3..8b5bb4c46b789 100644 --- a/enterprise/kernel/src/test/java/org/neo4j/shell/EnterpriseVersionTest.java +++ b/enterprise/kernel/src/test/java/org/neo4j/shell/EnterpriseVersionTest.java @@ -25,14 +25,14 @@ import java.io.ByteArrayOutputStream; import java.io.PrintStream; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; 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.TargetDirectory.testDirForTest; +import static org.neo4j.test.rule.TargetDirectory.testDirForTest; public class EnterpriseVersionTest { diff --git a/enterprise/kernel/src/test/java/org/neo4j/graphdb/factory/EnterpriseDatabaseRule.java b/enterprise/kernel/src/test/java/org/neo4j/test/rule/EnterpriseDatabaseRule.java similarity index 87% rename from enterprise/kernel/src/test/java/org/neo4j/graphdb/factory/EnterpriseDatabaseRule.java rename to enterprise/kernel/src/test/java/org/neo4j/test/rule/EnterpriseDatabaseRule.java index e31f73a72b17e..041879180faef 100644 --- a/enterprise/kernel/src/test/java/org/neo4j/graphdb/factory/EnterpriseDatabaseRule.java +++ b/enterprise/kernel/src/test/java/org/neo4j/test/rule/EnterpriseDatabaseRule.java @@ -17,9 +17,10 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.graphdb.factory; +package org.neo4j.test.rule; -import org.neo4j.test.EmbeddedDatabaseRule; +import org.neo4j.graphdb.factory.EnterpriseGraphDatabaseFactory; +import org.neo4j.graphdb.factory.GraphDatabaseFactory; public class EnterpriseDatabaseRule extends EmbeddedDatabaseRule { diff --git a/enterprise/management/src/test/java/org/neo4j/management/ManagementBeansTest.java b/enterprise/management/src/test/java/org/neo4j/management/ManagementBeansTest.java index 2290b0fdac3d5..20e2566be793a 100644 --- a/enterprise/management/src/test/java/org/neo4j/management/ManagementBeansTest.java +++ b/enterprise/management/src/test/java/org/neo4j/management/ManagementBeansTest.java @@ -29,7 +29,7 @@ import org.neo4j.jmx.Primitives; import org.neo4j.jmx.impl.JmxKernelExtension; import org.neo4j.kernel.internal.GraphDatabaseAPI; -import org.neo4j.test.EmbeddedDatabaseRule; +import org.neo4j.test.rule.EmbeddedDatabaseRule; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; diff --git a/enterprise/management/src/test/java/org/neo4j/management/TestLockManagerBean.java b/enterprise/management/src/test/java/org/neo4j/management/TestLockManagerBean.java index 0d4e4310552c0..df20a9d4e86a6 100644 --- a/enterprise/management/src/test/java/org/neo4j/management/TestLockManagerBean.java +++ b/enterprise/management/src/test/java/org/neo4j/management/TestLockManagerBean.java @@ -19,19 +19,21 @@ */ package org.neo4j.management; -import java.util.List; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; + +import java.util.List; + import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; import org.neo4j.jmx.impl.JmxKernelExtension; -import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.info.LockInfo; -import org.neo4j.test.ImpermanentDatabaseRule; +import org.neo4j.kernel.internal.GraphDatabaseAPI; +import org.neo4j.test.rule.ImpermanentDatabaseRule; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; public class TestLockManagerBean { diff --git a/enterprise/metrics/src/test/java/org/neo4j/metrics/BoltMetricsIT.java b/enterprise/metrics/src/test/java/org/neo4j/metrics/BoltMetricsIT.java index a610f7572fdf6..0f12c37ecb27f 100644 --- a/enterprise/metrics/src/test/java/org/neo4j/metrics/BoltMetricsIT.java +++ b/enterprise/metrics/src/test/java/org/neo4j/metrics/BoltMetricsIT.java @@ -45,7 +45,7 @@ import static org.neo4j.helpers.collection.MapUtil.map; import static org.neo4j.metrics.MetricsTestHelper.metricsCsv; import static org.neo4j.metrics.MetricsTestHelper.readLongValue; -import static org.neo4j.test.Assert.assertEventually; +import static org.neo4j.test.assertion.Assert.assertEventually; public class BoltMetricsIT { diff --git a/enterprise/metrics/src/test/java/org/neo4j/metrics/CoreEdgeMetricsIT.java b/enterprise/metrics/src/test/java/org/neo4j/metrics/CoreEdgeMetricsIT.java index 2582fcb05381c..c0e6cdf496978 100644 --- a/enterprise/metrics/src/test/java/org/neo4j/metrics/CoreEdgeMetricsIT.java +++ b/enterprise/metrics/src/test/java/org/neo4j/metrics/CoreEdgeMetricsIT.java @@ -36,7 +36,7 @@ import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.factory.GraphDatabaseFacade; import org.neo4j.metrics.source.coreedge.CoreMetrics; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static java.util.concurrent.TimeUnit.SECONDS; import static org.hamcrest.CoreMatchers.equalTo; @@ -51,7 +51,7 @@ import static org.neo4j.metrics.source.coreedge.EdgeMetrics.PULL_UPDATES; import static org.neo4j.metrics.source.coreedge.EdgeMetrics.PULL_UPDATE_HIGHEST_TX_ID_RECEIVED; import static org.neo4j.metrics.source.coreedge.EdgeMetrics.PULL_UPDATE_HIGHEST_TX_ID_REQUESTED; -import static org.neo4j.test.Assert.assertEventually; +import static org.neo4j.test.assertion.Assert.assertEventually; public class CoreEdgeMetricsIT { diff --git a/enterprise/metrics/src/test/java/org/neo4j/metrics/MetricsTestHelper.java b/enterprise/metrics/src/test/java/org/neo4j/metrics/MetricsTestHelper.java index 05bf25257ed72..387d83ac6f9b4 100644 --- a/enterprise/metrics/src/test/java/org/neo4j/metrics/MetricsTestHelper.java +++ b/enterprise/metrics/src/test/java/org/neo4j/metrics/MetricsTestHelper.java @@ -29,7 +29,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -import static org.neo4j.test.Assert.assertEventually; +import static org.neo4j.test.assertion.Assert.assertEventually; public class MetricsTestHelper { 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 60990ec9b0323..68c760f28efc6 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 @@ -36,7 +36,7 @@ import org.neo4j.kernel.lifecycle.LifeRule; import org.neo4j.logging.NullLog; import org.neo4j.metrics.MetricsSettings; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static java.lang.System.currentTimeMillis; import static java.util.concurrent.TimeUnit.SECONDS; 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 40493367a0d98..17994f6ff69c5 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 @@ -33,7 +33,7 @@ import org.neo4j.kernel.impl.MyRelTypes; import org.neo4j.kernel.impl.factory.GraphDatabaseFacadeFactory; import org.neo4j.kernel.impl.store.format.highlimit.HighLimit; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static org.junit.Assert.assertEquals; import static org.neo4j.helpers.collection.Iterables.single; diff --git a/enterprise/neo4j-enterprise/src/test/java/upgrade/StoreMigratorFrom20IT.java b/enterprise/neo4j-enterprise/src/test/java/upgrade/StoreMigratorFrom20IT.java index 98318b34e8732..8df05bd9f2c18 100644 --- a/enterprise/neo4j-enterprise/src/test/java/upgrade/StoreMigratorFrom20IT.java +++ b/enterprise/neo4j-enterprise/src/test/java/upgrade/StoreMigratorFrom20IT.java @@ -19,15 +19,16 @@ */ package upgrade; -import java.io.File; -import java.io.IOException; -import java.util.Map; import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import java.io.File; +import java.io.IOException; +import java.util.Map; + import org.neo4j.consistency.checking.full.ConsistencyCheckIncompleteException; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.factory.EnterpriseGraphDatabaseFactory; @@ -58,17 +59,16 @@ import org.neo4j.kernel.impl.storemigration.participant.StoreMigrator; import org.neo4j.kernel.lifecycle.LifeSupport; import org.neo4j.logging.NullLogProvider; -import org.neo4j.test.PageCacheRule; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.PageCacheRule; +import org.neo4j.test.rule.TargetDirectory; 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; public class StoreMigratorFrom20IT { diff --git a/enterprise/neo4j-enterprise/src/test/java/upgrade/StoreMigratorFrom21IT.java b/enterprise/neo4j-enterprise/src/test/java/upgrade/StoreMigratorFrom21IT.java index 9e8287c92b03d..c567b86784146 100644 --- a/enterprise/neo4j-enterprise/src/test/java/upgrade/StoreMigratorFrom21IT.java +++ b/enterprise/neo4j-enterprise/src/test/java/upgrade/StoreMigratorFrom21IT.java @@ -52,7 +52,7 @@ import org.neo4j.kernel.impl.storemigration.MigrationTestUtils; import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.logging.NullLogProvider; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; 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 3487c8bb940a0..de042655baab7 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 @@ -30,8 +30,8 @@ import org.neo4j.harness.TestServerBuilder; import org.neo4j.server.ServerTestUtils; import org.neo4j.server.configuration.ServerSettings; -import org.neo4j.test.SuppressOutput; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.SuppressOutput; +import org.neo4j.test.rule.TargetDirectory; import org.neo4j.test.server.HTTP; import static org.hamcrest.CoreMatchers.equalTo; diff --git a/enterprise/neo4j-harness-enterprise/src/test/java/org/neo4j/harness/junit/EnterpriseNeo4jRuleTest.java b/enterprise/neo4j-harness-enterprise/src/test/java/org/neo4j/harness/junit/EnterpriseNeo4jRuleTest.java index a53a82bbbd35a..0ed5be4d6a567 100644 --- a/enterprise/neo4j-harness-enterprise/src/test/java/org/neo4j/harness/junit/EnterpriseNeo4jRuleTest.java +++ b/enterprise/neo4j-harness-enterprise/src/test/java/org/neo4j/harness/junit/EnterpriseNeo4jRuleTest.java @@ -25,7 +25,7 @@ import org.neo4j.harness.extensionpackage.MyEnterpriseUnmanagedExtension; import org.neo4j.server.configuration.ServerSettings; -import org.neo4j.test.SuppressOutput; +import org.neo4j.test.rule.SuppressOutput; import org.neo4j.test.server.HTTP; import static org.hamcrest.MatcherAssert.assertThat; 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 31692ca80f088..6ac74c5bbaea3 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 @@ -42,9 +42,9 @@ import org.neo4j.graphdb.factory.GraphDatabaseSettings; import org.neo4j.kernel.configuration.Settings; import org.neo4j.logging.AssertableLogProvider; -import org.neo4j.test.EphemeralFileSystemRule; -import org.neo4j.test.TargetDirectory; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; 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 d1d08794b5c14..9aadcbcb272b7 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 @@ -19,6 +19,13 @@ */ package org.neo4j.server.enterprise; +import org.apache.commons.lang3.SystemUtils; +import org.junit.After; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TestRule; + import java.io.File; import java.io.IOException; import java.io.OutputStream; @@ -32,13 +39,6 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.commons.lang3.SystemUtils; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TestRule; - import org.neo4j.cluster.InstanceId; import org.neo4j.cluster.client.ClusterClient; import org.neo4j.cluster.client.ClusterClientModule; @@ -57,19 +57,17 @@ import org.neo4j.server.enterprise.functional.DumpPortListenerOnNettyBindFailure; import org.neo4j.test.InputStreamAwaiter; import org.neo4j.test.ProcessStreamHandler; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static java.lang.Runtime.getRuntime; import static java.lang.String.format; import static java.lang.System.getProperty; import static java.util.Arrays.asList; import static java.util.concurrent.TimeUnit.SECONDS; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assume.assumeFalse; - import static org.neo4j.cluster.ClusterSettings.cluster_server; import static org.neo4j.cluster.ClusterSettings.initial_hosts; import static org.neo4j.cluster.ClusterSettings.server_id; diff --git a/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/EnterpriseBootstrapperTest.java b/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/EnterpriseBootstrapperTest.java index 030f48c449253..48b6e224f4e7e 100644 --- a/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/EnterpriseBootstrapperTest.java +++ b/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/EnterpriseBootstrapperTest.java @@ -19,25 +19,24 @@ */ package org.neo4j.server.enterprise; -import java.util.concurrent.TimeUnit; - import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import java.util.concurrent.TimeUnit; + import org.neo4j.cluster.ClusterSettings; import org.neo4j.server.BaseBootstrapperTest; import org.neo4j.server.ServerBootstrapper; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertEquals; - import static org.neo4j.dbms.DatabaseManagementSystemSettings.data_directory; import static org.neo4j.server.ServerTestUtils.getRelativePath; import static org.neo4j.server.configuration.ServerSettings.certificates_directory; import static org.neo4j.server.configuration.ServerSettings.tls_certificate_file; import static org.neo4j.server.configuration.ServerSettings.tls_key_file; -import static org.neo4j.test.Assert.assertEventually; +import static org.neo4j.test.assertion.Assert.assertEventually; public class EnterpriseBootstrapperTest extends BaseBootstrapperTest { 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 4c742ac222f4b..c31b600412609 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 @@ -19,26 +19,26 @@ */ package org.neo4j.server.enterprise; -import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN; -import static org.junit.Assert.assertEquals; -import static org.neo4j.server.rest.MasterInfoService.BASE_PATH; -import static org.neo4j.server.rest.MasterInfoService.IS_MASTER_PATH; -import static org.neo4j.server.rest.MasterInfoService.IS_SLAVE_PATH; -import static org.neo4j.test.server.ha.EnterpriseServerHelper.createNonPersistentServer; - -import java.io.IOException; -import java.util.Map; - import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import java.io.IOException; +import java.util.Map; + import org.neo4j.server.helpers.FunctionalTestHelper; import org.neo4j.server.rest.JaxRsResponse; import org.neo4j.server.rest.RestRequest; import org.neo4j.server.rest.domain.JsonHelper; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; + +import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN; +import static org.junit.Assert.assertEquals; +import static org.neo4j.server.rest.MasterInfoService.BASE_PATH; +import static org.neo4j.server.rest.MasterInfoService.IS_MASTER_PATH; +import static org.neo4j.server.rest.MasterInfoService.IS_SLAVE_PATH; +import static org.neo4j.test.server.ha.EnterpriseServerHelper.createNonPersistentServer; public class StandaloneHaInfoFunctionalTest { 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 0e1c4f95a485d..9ed727771dc0b 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 @@ -33,12 +33,11 @@ import org.neo4j.server.configuration.ConfigLoader; import org.neo4j.server.enterprise.EnterpriseNeoServer; import org.neo4j.server.enterprise.helpers.EnterpriseServerBuilder; -import org.neo4j.test.CleanupRule; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.CleanupRule; +import org.neo4j.test.rule.TargetDirectory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; - import static org.neo4j.helpers.collection.MapUtil.stringMap; public class ServerManagementTest diff --git a/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/EnterpriseVersionAndEditionServiceIT.java b/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/EnterpriseVersionAndEditionServiceIT.java index fcb82db2ce6e4..a16e9b57e2985 100644 --- a/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/EnterpriseVersionAndEditionServiceIT.java +++ b/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/EnterpriseVersionAndEditionServiceIT.java @@ -40,7 +40,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; -import static org.neo4j.test.SuppressOutput.suppressAll; +import static org.neo4j.test.rule.SuppressOutput.suppressAll; /* Note that when running this test from within an IDE, the version field will be an empty string. This is because the diff --git a/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/PropertyExistenceConstraintsDocIT.java b/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/PropertyExistenceConstraintsDocIT.java index 52c137894afbf..ec7cdebe3b20b 100644 --- a/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/PropertyExistenceConstraintsDocIT.java +++ b/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/PropertyExistenceConstraintsDocIT.java @@ -56,7 +56,7 @@ import static org.neo4j.server.rest.domain.JsonHelper.jsonToList; import static org.neo4j.server.rest.web.Surface.PATH_SCHEMA_CONSTRAINT; import static org.neo4j.server.rest.web.Surface.PATH_SCHEMA_RELATIONSHIP_CONSTRAINT; -import static org.neo4j.test.SuppressOutput.suppressAll; +import static org.neo4j.test.rule.SuppressOutput.suppressAll; public class PropertyExistenceConstraintsDocIT implements GraphHolder { 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 f22195bbc4eb6..1c84dd099e2fb 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 @@ -49,10 +49,10 @@ import org.neo4j.graphdb.factory.GraphDatabaseBuilder; import org.neo4j.helpers.collection.MapUtil; import org.neo4j.kernel.internal.GraphDatabaseAPI; -import org.neo4j.test.RegexMatcher; -import org.neo4j.test.TargetDirectory; 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.udc.UsageData; import org.neo4j.udc.UsageDataKeys; diff --git a/integrationtests/src/test/java/org/neo4j/ha/HAClusterStartupIT.java b/integrationtests/src/test/java/org/neo4j/ha/HAClusterStartupIT.java index 96a9fa4dedc39..82a72eefd7d0a 100644 --- a/integrationtests/src/test/java/org/neo4j/ha/HAClusterStartupIT.java +++ b/integrationtests/src/test/java/org/neo4j/ha/HAClusterStartupIT.java @@ -33,8 +33,8 @@ import org.neo4j.kernel.ha.HighlyAvailableGraphDatabase; import org.neo4j.kernel.impl.ha.ClusterManager; import org.neo4j.kernel.impl.storemigration.LogFiles; -import org.neo4j.test.TargetDirectory; -import org.neo4j.test.TargetDirectory.TestDirectory; +import org.neo4j.test.rule.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory.TestDirectory; import static org.neo4j.consistency.store.StoreAssertions.assertConsistentStore; import static org.neo4j.kernel.impl.ha.ClusterManager.allSeesAllAsAvailable; diff --git a/integrationtests/src/test/java/org/neo4j/storeupgrade/LegacyIndexesUpgradeTest.java b/integrationtests/src/test/java/org/neo4j/storeupgrade/LegacyIndexesUpgradeTest.java index 31c5c88a326e6..230bb8791c072 100644 --- a/integrationtests/src/test/java/org/neo4j/storeupgrade/LegacyIndexesUpgradeTest.java +++ b/integrationtests/src/test/java/org/neo4j/storeupgrade/LegacyIndexesUpgradeTest.java @@ -43,10 +43,10 @@ import org.neo4j.io.fs.FileUtils; import org.neo4j.kernel.impl.storemigration.UpgradeNotAllowedByConfigurationException; import org.neo4j.test.NestedThrowableMatcher; -import org.neo4j.test.SuppressOutput; -import org.neo4j.test.TargetDirectory; import org.neo4j.test.TestGraphDatabaseFactory; import org.neo4j.test.Unzip; +import org.neo4j.test.rule.SuppressOutput; +import org.neo4j.test.rule.TargetDirectory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/integrationtests/src/test/java/org/neo4j/storeupgrade/StoreUpgradeIntegrationTest.java b/integrationtests/src/test/java/org/neo4j/storeupgrade/StoreUpgradeIntegrationTest.java index 1bdc72e3fae74..0524365020c51 100644 --- a/integrationtests/src/test/java/org/neo4j/storeupgrade/StoreUpgradeIntegrationTest.java +++ b/integrationtests/src/test/java/org/neo4j/storeupgrade/StoreUpgradeIntegrationTest.java @@ -19,6 +19,12 @@ */ package org.neo4j.storeupgrade; +import org.junit.Rule; +import org.junit.Test; +import org.junit.experimental.runners.Enclosed; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + import java.io.File; import java.io.FileWriter; import java.io.IOException; @@ -31,12 +37,6 @@ import java.util.Optional; import java.util.Properties; -import org.junit.Rule; -import org.junit.Test; -import org.junit.experimental.runners.Enclosed; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; - import org.neo4j.dbms.DatabaseManagementSystemSettings; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Label; @@ -73,17 +73,16 @@ import org.neo4j.server.CommunityBootstrapper; import org.neo4j.server.ServerBootstrapper; import org.neo4j.server.ServerTestUtils; -import org.neo4j.test.SuppressOutput; -import org.neo4j.test.TargetDirectory; import org.neo4j.test.TestGraphDatabaseFactory; import org.neo4j.test.Unzip; +import org.neo4j.test.rule.SuppressOutput; +import org.neo4j.test.rule.TargetDirectory; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; - import static org.neo4j.consistency.store.StoreAssertions.assertConsistentStore; import static org.neo4j.helpers.collection.Iterables.count; import static org.neo4j.helpers.collection.MapUtil.stringMap; 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 80c5f6d90739a..10f2037f094bd 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 @@ -35,8 +35,8 @@ import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.index.Index; import org.neo4j.graphdb.index.UniqueFactory; -import org.neo4j.test.TargetDirectory; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.TargetDirectory; import static java.lang.String.format; import static org.junit.Assert.assertEquals; diff --git a/manual/embedded-examples/src/test/java/org/neo4j/examples/PathFindingDocTest.java b/manual/embedded-examples/src/test/java/org/neo4j/examples/PathFindingDocTest.java index b518e1c20afaa..8012dd72a256c 100644 --- a/manual/embedded-examples/src/test/java/org/neo4j/examples/PathFindingDocTest.java +++ b/manual/embedded-examples/src/test/java/org/neo4j/examples/PathFindingDocTest.java @@ -41,7 +41,7 @@ import org.neo4j.graphdb.Relationship; import org.neo4j.graphdb.RelationshipType; import org.neo4j.graphdb.Transaction; -import org.neo4j.test.EmbeddedDatabaseRule; +import org.neo4j.test.rule.EmbeddedDatabaseRule; import static org.junit.Assert.assertEquals; 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 89505f34f0693..7bc3464c30734 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,12 +24,15 @@ import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.factory.GraphDatabaseFactory; import org.neo4j.graphdb.factory.GraphDatabaseSettings; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; import static org.junit.Assert.assertNotNull; public class StartWithConfigurationDocTest { + @Rule + public TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); + @Test public void loadFromFile() { @@ -58,7 +61,4 @@ public void loadFromHashmap() assertNotNull( graphDb ); graphDb.shutdown(); } - - @Rule - public TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() ); } diff --git a/manual/neo4j-harness-enterprise-test/src/test/java/org/neo4j/harness/enterprise/doc/ExtensionTestingDocTest.java b/manual/neo4j-harness-enterprise-test/src/test/java/org/neo4j/harness/enterprise/doc/ExtensionTestingDocTest.java index b0c4e8e06a61d..f7ada522524b2 100644 --- a/manual/neo4j-harness-enterprise-test/src/test/java/org/neo4j/harness/enterprise/doc/ExtensionTestingDocTest.java +++ b/manual/neo4j-harness-enterprise-test/src/test/java/org/neo4j/harness/enterprise/doc/ExtensionTestingDocTest.java @@ -36,7 +36,7 @@ import org.neo4j.harness.TestServerBuilder; import org.neo4j.server.ServerTestUtils; import org.neo4j.server.configuration.ServerSettings; -import org.neo4j.test.SuppressOutput; +import org.neo4j.test.rule.SuppressOutput; import org.neo4j.test.server.HTTP; import static org.junit.Assert.assertEquals; diff --git a/manual/neo4j-harness-enterprise-test/src/test/java/org/neo4j/harness/enterprise/doc/JUnitDocTest.java b/manual/neo4j-harness-enterprise-test/src/test/java/org/neo4j/harness/enterprise/doc/JUnitDocTest.java index 20d822844dd54..5eba4f3cd7ba0 100644 --- a/manual/neo4j-harness-enterprise-test/src/test/java/org/neo4j/harness/enterprise/doc/JUnitDocTest.java +++ b/manual/neo4j-harness-enterprise-test/src/test/java/org/neo4j/harness/enterprise/doc/JUnitDocTest.java @@ -33,7 +33,7 @@ import org.neo4j.harness.junit.EnterpriseNeo4jRule; import org.neo4j.harness.junit.Neo4jRule; import org.neo4j.server.configuration.ServerSettings; -import org.neo4j.test.SuppressOutput; +import org.neo4j.test.rule.SuppressOutput; import org.neo4j.test.server.HTTP; import static org.junit.Assert.assertEquals; diff --git a/manual/neo4j-harness-test/src/test/java/org/neo4j/harness/doc/ExtensionTestingDocTest.java b/manual/neo4j-harness-test/src/test/java/org/neo4j/harness/doc/ExtensionTestingDocTest.java index e42d3ae2336f9..1abd45cc2b8d2 100644 --- a/manual/neo4j-harness-test/src/test/java/org/neo4j/harness/doc/ExtensionTestingDocTest.java +++ b/manual/neo4j-harness-test/src/test/java/org/neo4j/harness/doc/ExtensionTestingDocTest.java @@ -36,7 +36,7 @@ import org.neo4j.harness.TestServerBuilders; import org.neo4j.server.ServerTestUtils; import org.neo4j.server.configuration.ServerSettings; -import org.neo4j.test.SuppressOutput; +import org.neo4j.test.rule.SuppressOutput; import org.neo4j.test.server.HTTP; import static org.junit.Assert.assertEquals; diff --git a/manual/neo4j-harness-test/src/test/java/org/neo4j/harness/doc/JUnitDocTest.java b/manual/neo4j-harness-test/src/test/java/org/neo4j/harness/doc/JUnitDocTest.java index 22e6537a8ec7c..597255b9da798 100644 --- a/manual/neo4j-harness-test/src/test/java/org/neo4j/harness/doc/JUnitDocTest.java +++ b/manual/neo4j-harness-test/src/test/java/org/neo4j/harness/doc/JUnitDocTest.java @@ -29,7 +29,7 @@ import org.neo4j.graphdb.Transaction; import org.neo4j.harness.junit.Neo4jRule; import org.neo4j.server.configuration.ServerSettings; -import org.neo4j.test.SuppressOutput; +import org.neo4j.test.rule.SuppressOutput; import org.neo4j.test.server.HTTP; import static org.junit.Assert.assertEquals; @@ -40,7 +40,8 @@ public class JUnitDocTest { - @Rule public SuppressOutput suppressOutput = SuppressOutput.suppressAll(); + @Rule + public SuppressOutput suppressOutput = SuppressOutput.suppressAll(); // START SNIPPET: useJUnitRule @Rule 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 ec753c06d2910..b47b46a72e05e 100644 --- a/tools/src/test/java/org/neo4j/tools/applytx/DatabaseRebuildToolTest.java +++ b/tools/src/test/java/org/neo4j/tools/applytx/DatabaseRebuildToolTest.java @@ -39,14 +39,12 @@ import org.neo4j.kernel.impl.store.MetaDataStore; import org.neo4j.kernel.impl.transaction.log.TransactionIdStore; import org.neo4j.test.DbRepresentation; -import org.neo4j.test.TargetDirectory; +import org.neo4j.test.rule.TargetDirectory; +import static java.lang.String.format; import static org.hamcrest.Matchers.containsString; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; - -import static java.lang.String.format; - import static org.neo4j.graphdb.DynamicLabel.label; import static org.neo4j.graphdb.DynamicRelationshipType.withName; import static org.neo4j.kernel.impl.pagecache.StandalonePageCacheFactory.createPageCache; diff --git a/tools/src/test/java/org/neo4j/tools/dump/DumpCountsStoreTest.java b/tools/src/test/java/org/neo4j/tools/dump/DumpCountsStoreTest.java index 6fa97ea804cca..1520dc4b51e47 100644 --- a/tools/src/test/java/org/neo4j/tools/dump/DumpCountsStoreTest.java +++ b/tools/src/test/java/org/neo4j/tools/dump/DumpCountsStoreTest.java @@ -38,7 +38,7 @@ import org.neo4j.kernel.impl.store.kvstore.ReadableBuffer; import org.neo4j.kernel.impl.store.kvstore.WritableBuffer; import org.neo4j.storageengine.api.Token; -import org.neo4j.test.SuppressOutput; +import org.neo4j.test.rule.SuppressOutput; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.containsString; 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 4633916def230..d6fdf05c84442 100644 --- a/tools/src/test/java/org/neo4j/tools/migration/StoreMigrationTest.java +++ b/tools/src/test/java/org/neo4j/tools/migration/StoreMigrationTest.java @@ -30,10 +30,10 @@ import org.neo4j.graphdb.Transaction; import org.neo4j.kernel.impl.factory.GraphDatabaseFacadeFactory; import org.neo4j.kernel.impl.store.format.highlimit.HighLimit; -import org.neo4j.test.SuppressOutput; -import org.neo4j.test.TargetDirectory; import org.neo4j.test.TestGraphDatabaseFactory; import org.neo4j.test.Unzip; +import org.neo4j.test.rule.SuppressOutput; +import org.neo4j.test.rule.TargetDirectory; public class StoreMigrationTest { 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 3d036fbc5e275..45208c4e6a780 100644 --- a/tools/src/test/java/org/neo4j/tools/rebuild/RebuildFromLogsTest.java +++ b/tools/src/test/java/org/neo4j/tools/rebuild/RebuildFromLogsTest.java @@ -43,15 +43,15 @@ import org.neo4j.kernel.impl.store.format.highlimit.HighLimit; import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.test.DbRepresentation; -import org.neo4j.test.SuppressOutput; -import org.neo4j.test.TargetDirectory; import org.neo4j.test.TestGraphDatabaseFactory; +import org.neo4j.test.rule.SuppressOutput; +import org.neo4j.test.rule.TargetDirectory; import static org.junit.Assert.assertEquals; import static org.neo4j.helpers.collection.MapUtil.stringMap; import static org.neo4j.kernel.impl.factory.GraphDatabaseFacadeFactory.Configuration.record_format; import static org.neo4j.kernel.impl.transaction.log.TransactionIdStore.BASE_TX_ID; -import static org.neo4j.test.TargetDirectory.testDirForTest; +import static org.neo4j.test.rule.TargetDirectory.testDirForTest; @RunWith(Parameterized.class) public class RebuildFromLogsTest diff --git a/tools/src/test/java/org/neo4j/tools/txlog/CheckTxLogsTest.java b/tools/src/test/java/org/neo4j/tools/txlog/CheckTxLogsTest.java index 13acfa43ca12b..9ed74c6f04952 100644 --- a/tools/src/test/java/org/neo4j/tools/txlog/CheckTxLogsTest.java +++ b/tools/src/test/java/org/neo4j/tools/txlog/CheckTxLogsTest.java @@ -40,16 +40,16 @@ import org.neo4j.kernel.impl.store.record.RelationshipRecord; import org.neo4j.kernel.impl.transaction.command.Command; import org.neo4j.kernel.impl.transaction.log.LogVersionedStoreChannel; +import org.neo4j.kernel.impl.transaction.log.PhysicalFlushableChannel; import org.neo4j.kernel.impl.transaction.log.PhysicalLogFile; import org.neo4j.kernel.impl.transaction.log.PhysicalLogFiles; import org.neo4j.kernel.impl.transaction.log.PhysicalLogVersionedStoreChannel; import org.neo4j.kernel.impl.transaction.log.PhysicalTransactionRepresentation; -import org.neo4j.kernel.impl.transaction.log.PhysicalFlushableChannel; import org.neo4j.kernel.impl.transaction.log.TransactionLogWriter; import org.neo4j.kernel.impl.transaction.log.entry.LogEntryWriter; import org.neo4j.kernel.impl.transaction.log.entry.LogHeaderWriter; -import org.neo4j.test.EphemeralFileSystemRule; -import org.neo4j.test.SuppressOutput; +import org.neo4j.test.rule.SuppressOutput; +import org.neo4j.test.rule.filesystem.EphemeralFileSystemRule; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse;