diff --git a/community/community-it/index-it/src/test/java/org/neo4j/graphdb/IndexingAcceptanceTest.java b/community/community-it/index-it/src/test/java/org/neo4j/graphdb/IndexingAcceptanceTest.java index fe1301c510a6..cac30a679489 100644 --- a/community/community-it/index-it/src/test/java/org/neo4j/graphdb/IndexingAcceptanceTest.java +++ b/community/community-it/index-it/src/test/java/org/neo4j/graphdb/IndexingAcceptanceTest.java @@ -30,6 +30,7 @@ import org.neo4j.graphdb.spatial.Point; import org.neo4j.helpers.collection.Iterators; import org.neo4j.test.mockito.matcher.Neo4jMatchers; +import org.neo4j.test.mockito.mock.SpatialMocks; import org.neo4j.test.rule.ImpermanentDatabaseRule; import org.neo4j.values.storable.CoordinateReferenceSystem; import org.neo4j.values.storable.PointValue; @@ -40,10 +41,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; -import static org.neo4j.graphdb.SpatialMocks.mockCartesian; -import static org.neo4j.graphdb.SpatialMocks.mockCartesian_3D; -import static org.neo4j.graphdb.SpatialMocks.mockWGS84; -import static org.neo4j.graphdb.SpatialMocks.mockWGS84_3D; import static org.neo4j.helpers.collection.Iterators.asSet; import static org.neo4j.helpers.collection.Iterators.count; import static org.neo4j.helpers.collection.MapUtil.map; @@ -52,6 +49,10 @@ 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.mock.SpatialMocks.mockCartesian; +import static org.neo4j.test.mockito.mock.SpatialMocks.mockCartesian_3D; +import static org.neo4j.test.mockito.mock.SpatialMocks.mockWGS84; +import static org.neo4j.test.mockito.mock.SpatialMocks.mockWGS84_3D; public class IndexingAcceptanceTest { diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/ConstraintCreatorFacadeMethods.java b/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/ConstraintCreatorFacadeMethods.java similarity index 100% rename from community/kernel/src/test/java/org/neo4j/graphdb/ConstraintCreatorFacadeMethods.java rename to community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/ConstraintCreatorFacadeMethods.java diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/ConstraintDefinitionFacadeMethods.java b/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/ConstraintDefinitionFacadeMethods.java similarity index 100% rename from community/kernel/src/test/java/org/neo4j/graphdb/ConstraintDefinitionFacadeMethods.java rename to community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/ConstraintDefinitionFacadeMethods.java diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/GraphDatabaseServiceFacadeMethods.java b/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/GraphDatabaseServiceFacadeMethods.java similarity index 100% rename from community/kernel/src/test/java/org/neo4j/graphdb/GraphDatabaseServiceFacadeMethods.java rename to community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/GraphDatabaseServiceFacadeMethods.java diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/IndexCreatorFacadeMethods.java b/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/IndexCreatorFacadeMethods.java similarity index 100% rename from community/kernel/src/test/java/org/neo4j/graphdb/IndexCreatorFacadeMethods.java rename to community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/IndexCreatorFacadeMethods.java diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/IndexDefinitionFacadeMethods.java b/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/IndexDefinitionFacadeMethods.java similarity index 100% rename from community/kernel/src/test/java/org/neo4j/graphdb/IndexDefinitionFacadeMethods.java rename to community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/IndexDefinitionFacadeMethods.java diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/IndexManagerFacadeMethods.java b/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/IndexManagerFacadeMethods.java similarity index 100% rename from community/kernel/src/test/java/org/neo4j/graphdb/IndexManagerFacadeMethods.java rename to community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/IndexManagerFacadeMethods.java diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/NodeFacadeMethods.java b/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/NodeFacadeMethods.java similarity index 100% rename from community/kernel/src/test/java/org/neo4j/graphdb/NodeFacadeMethods.java rename to community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/NodeFacadeMethods.java diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/RelationshipFacadeMethods.java b/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/RelationshipFacadeMethods.java similarity index 100% rename from community/kernel/src/test/java/org/neo4j/graphdb/RelationshipFacadeMethods.java rename to community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/RelationshipFacadeMethods.java diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/SchemaFacadeMethods.java b/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/SchemaFacadeMethods.java similarity index 100% rename from community/kernel/src/test/java/org/neo4j/graphdb/SchemaFacadeMethods.java rename to community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/SchemaFacadeMethods.java diff --git a/community/kernel/src/test/java/org/neo4j/diagnostics/DiagnosticsReporterTest.java b/community/kernel/src/test/java/org/neo4j/diagnostics/DiagnosticsReporterTest.java index d75a26b8eb55..ac73b5244311 100644 --- a/community/kernel/src/test/java/org/neo4j/diagnostics/DiagnosticsReporterTest.java +++ b/community/kernel/src/test/java/org/neo4j/diagnostics/DiagnosticsReporterTest.java @@ -19,8 +19,8 @@ */ package org.neo4j.diagnostics; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import java.io.ByteArrayOutputStream; import java.io.File; @@ -37,86 +37,30 @@ import java.util.List; import java.util.Set; +import org.neo4j.io.fs.DefaultFileSystemAbstraction; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.kernel.configuration.Config; +import org.neo4j.test.extension.DefaultFileSystemExtension; +import org.neo4j.test.extension.Inject; +import org.neo4j.test.extension.TestDirectoryExtension; import org.neo4j.test.rule.TestDirectory; -import org.neo4j.test.rule.fs.DefaultFileSystemRule; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; import static org.neo4j.diagnostics.DiagnosticsReportSources.newDiagnosticsFile; -public class DiagnosticsReporterTest +@ExtendWith( {DefaultFileSystemExtension.class, TestDirectoryExtension.class} ) +class DiagnosticsReporterTest { - @Rule - public final TestDirectory testDirectory = TestDirectory.testDirectory(); - @Rule - public final DefaultFileSystemRule fileSystemRule = new DefaultFileSystemRule(); - - static class MyProvider extends DiagnosticsOfflineReportProvider - { - private final FileSystemAbstraction fs; - private List logFiles = new ArrayList<>(); - - MyProvider( FileSystemAbstraction fs ) - { - super( "my-provider", "logs" ); - this.fs = fs; - } - - void addFile( String destination, File file ) - { - logFiles.add( newDiagnosticsFile( destination, fs, file ) ); - } - - @Override - public void init( FileSystemAbstraction fs, Config config, File storeDirectory ) - { - } - - @Override - public List provideSources( Set classifiers ) - { - List sources = new ArrayList<>(); - if ( classifiers.contains( "fail" ) ) - { - sources.add( new FailingSource() ); - } - if ( classifiers.contains( "logs" ) ) - { - sources.addAll( logFiles ); - } - - return sources; - } - } - - private static class FailingSource implements DiagnosticsReportSource - { - @Override - public String destinationPath() - { - return "fail.txt"; - } - - @Override - public void addToArchive( Path archiveDestination, DiagnosticsReporterProgress progress ) - { - progress.percentChanged( 30 ); - throw new RuntimeException( "You had it coming..." ); - } - - @Override - public long estimatedSize( DiagnosticsReporterProgress progress ) - { - return 0; - } - } + @Inject + private TestDirectory testDirectory; + @Inject + private DefaultFileSystemAbstraction fileSystem; @Test - public void dumpFiles() throws Exception + void dumpFiles() throws Exception { DiagnosticsReporter reporter = setupDiagnosticsReporter(); @@ -129,10 +73,10 @@ public void dumpFiles() throws Exception } @Test - public void shouldContinueAfterError() throws Exception + void shouldContinueAfterError() throws Exception { DiagnosticsReporter reporter = new DiagnosticsReporter( ); - MyProvider myProvider = new MyProvider( fileSystemRule.get() ); + MyProvider myProvider = new MyProvider( fileSystem ); reporter.registerOfflineProvider( myProvider ); myProvider.addFile( "logs/a.txt", createNewFileWithContent( "a.txt", "file a") ); @@ -173,7 +117,7 @@ public void shouldContinueAfterError() throws Exception } @Test - public void supportPathsWithSpaces() throws IOException + void supportPathsWithSpaces() throws IOException { DiagnosticsReporter reporter = setupDiagnosticsReporter(); @@ -194,7 +138,7 @@ private File createNewFileWithContent( String name, String content ) throws IOEx private DiagnosticsReporter setupDiagnosticsReporter() throws IOException { DiagnosticsReporter reporter = new DiagnosticsReporter( ); - MyProvider myProvider = new MyProvider( fileSystemRule.get() ); + MyProvider myProvider = new MyProvider( fileSystem ); reporter.registerOfflineProvider( myProvider ); myProvider.addFile( "logs/a.txt", createNewFileWithContent( "a.txt", "file a") ); @@ -202,7 +146,7 @@ private DiagnosticsReporter setupDiagnosticsReporter() throws IOException return reporter; } - private void verifyContent( Path destination ) throws IOException + private static void verifyContent( Path destination ) throws IOException { URI uri = URI.create("jar:file:" + destination.toAbsolutePath().toUri().getRawPath() ); @@ -217,4 +161,64 @@ private void verifyContent( Path destination ) throws IOException assertEquals( "file b", fileB.get( 0 ) ); } } + + private static class MyProvider extends DiagnosticsOfflineReportProvider + { + private final FileSystemAbstraction fs; + private final List logFiles = new ArrayList<>(); + + MyProvider( FileSystemAbstraction fs ) + { + super( "my-provider", "logs" ); + this.fs = fs; + } + + void addFile( String destination, File file ) + { + logFiles.add( newDiagnosticsFile( destination, fs, file ) ); + } + + @Override + public void init( FileSystemAbstraction fs, Config config, File storeDirectory ) + { + } + + @Override + public List provideSources( Set classifiers ) + { + List sources = new ArrayList<>(); + if ( classifiers.contains( "fail" ) ) + { + sources.add( new FailingSource() ); + } + if ( classifiers.contains( "logs" ) ) + { + sources.addAll( logFiles ); + } + + return sources; + } + } + private static class FailingSource implements DiagnosticsReportSource + { + + @Override + public String destinationPath() + { + return "fail.txt"; + } + + @Override + public void addToArchive( Path archiveDestination, DiagnosticsReporterProgress progress ) + { + progress.percentChanged( 30 ); + throw new RuntimeException( "You had it coming..." ); + } + + @Override + public long estimatedSize( DiagnosticsReporterProgress progress ) + { + return 0; + } + } } diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/ResourceIterableTest.java b/community/kernel/src/test/java/org/neo4j/graphdb/ResourceIterableTest.java index 915a74e4be15..738e694f8040 100644 --- a/community/kernel/src/test/java/org/neo4j/graphdb/ResourceIterableTest.java +++ b/community/kernel/src/test/java/org/neo4j/graphdb/ResourceIterableTest.java @@ -19,7 +19,7 @@ */ package org.neo4j.graphdb; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; @@ -27,15 +27,15 @@ import java.util.stream.Collectors; import static java.util.Arrays.asList; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.neo4j.helpers.collection.Iterators.iterator; import static org.neo4j.helpers.collection.ResourceClosingIterator.newResourceIterator; -public class ResourceIterableTest +class ResourceIterableTest { @Test - public void streamShouldCloseSingleOnCompleted() + void streamShouldCloseSingleOnCompleted() { // Given AtomicBoolean closed = new AtomicBoolean( false ); @@ -52,7 +52,7 @@ public void streamShouldCloseSingleOnCompleted() } @Test - public void streamShouldCloseMultipleOnCompleted() + void streamShouldCloseMultipleOnCompleted() { // Given AtomicInteger closed = new AtomicInteger(); @@ -67,6 +67,6 @@ public void streamShouldCloseMultipleOnCompleted() // Then assertEquals( asList(1,2,3), result ); - assertEquals( "two calls to close", 2, closed.get() ); + assertEquals( 2, closed.get(), "two calls to close" ); } } diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/factory/GraphDatabaseSettingsTest.java b/community/kernel/src/test/java/org/neo4j/graphdb/factory/GraphDatabaseSettingsTest.java index 88c87f9a232b..c1b96865d8be 100644 --- a/community/kernel/src/test/java/org/neo4j/graphdb/factory/GraphDatabaseSettingsTest.java +++ b/community/kernel/src/test/java/org/neo4j/graphdb/factory/GraphDatabaseSettingsTest.java @@ -19,7 +19,7 @@ */ package org.neo4j.graphdb.factory; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.lang.reflect.Field; import java.util.HashMap; @@ -36,30 +36,30 @@ import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.configuration.HttpConnector; +import static java.lang.String.format; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.empty; -import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.neo4j.graphdb.factory.GraphDatabaseSettings.keep_logical_logs; import static org.neo4j.helpers.collection.MapUtil.stringMap; import static org.neo4j.kernel.configuration.HttpConnector.Encryption.TLS; -public class GraphDatabaseSettingsTest +class GraphDatabaseSettingsTest { @Test - public void mustHaveNullDefaultPageCacheMemorySizeInBytes() + void mustHaveNullDefaultPageCacheMemorySizeInBytes() { String bytes = Config.defaults().get( GraphDatabaseSettings.pagecache_memory ); assertThat( bytes, is( nullValue() ) ); } @Test - public void pageCacheSettingMustAcceptArbitraryUserSpecifiedValue() + void pageCacheSettingMustAcceptArbitraryUserSpecifiedValue() { Setting setting = GraphDatabaseSettings.pagecache_memory; assertThat( Config.defaults( setting, "245760" ).get( setting ), is( "245760" ) ); @@ -68,7 +68,7 @@ public void pageCacheSettingMustAcceptArbitraryUserSpecifiedValue() } @Test - public void noDuplicateSettingsAreAllowed() throws Exception + void noDuplicateSettingsAreAllowed() throws Exception { final HashMap fields = new HashMap<>(); for ( Field field : GraphDatabaseSettings.class.getDeclaredFields() ) @@ -77,16 +77,15 @@ public void noDuplicateSettingsAreAllowed() throws Exception { Setting setting = (Setting) field.get( null ); - assertFalse( - String.format( "'%s' in %s has already been defined in %s", setting.name(), field.getName(), - fields.get( setting.name() ) ), fields.containsKey( setting.name() ) ); + assertFalse( fields.containsKey( setting.name() ), + format( "'%s' in %s has already been defined in %s", setting.name(), field.getName(), fields.get( setting.name() ) ) ); fields.put( setting.name(), field.getName() ); } } } @Test - public void groupToScopeSetting() + void groupToScopeSetting() { // given String hostname = "my_other_host"; @@ -108,7 +107,7 @@ public void groupToScopeSetting() } @Test - public void shouldEnableBoltByDefault() + void shouldEnableBoltByDefault() { // given Config config = Config.builder().withServerDefaults().build(); @@ -122,7 +121,7 @@ public void shouldEnableBoltByDefault() } @Test - public void shouldBeAbleToDisableBoltConnectorWithJustOneParameter() + void shouldBeAbleToDisableBoltConnectorWithJustOneParameter() { // given Config config = Config.defaults( new BoltConnector( "bolt" ).enabled, "false" ); @@ -133,7 +132,7 @@ public void shouldBeAbleToDisableBoltConnectorWithJustOneParameter() } @Test - public void shouldBeAbleToOverrideBoltListenAddressesWithJustOneParameter() + void shouldBeAbleToOverrideBoltListenAddressesWithJustOneParameter() { // given Config config = Config.defaults( stringMap( @@ -147,7 +146,7 @@ public void shouldBeAbleToOverrideBoltListenAddressesWithJustOneParameter() } @Test - public void shouldDeriveBoltListenAddressFromDefaultListenAddress() + void shouldDeriveBoltListenAddressFromDefaultListenAddress() { // given Config config = Config.defaults( stringMap( @@ -161,7 +160,7 @@ public void shouldDeriveBoltListenAddressFromDefaultListenAddress() } @Test - public void shouldDeriveBoltListenAddressFromDefaultListenAddressAndSpecifiedPort() + void shouldDeriveBoltListenAddressFromDefaultListenAddressAndSpecifiedPort() { // given Config config = Config.defaults( stringMap( @@ -176,7 +175,7 @@ public void shouldDeriveBoltListenAddressFromDefaultListenAddressAndSpecifiedPor } @Test - public void shouldStillSupportCustomNameForBoltConnector() + void shouldStillSupportCustomNameForBoltConnector() { Config config = Config.defaults( stringMap( "dbms.connector.random_name_that_will_be_unsupported.type", "BOLT", @@ -191,7 +190,7 @@ public void shouldStillSupportCustomNameForBoltConnector() } @Test - public void shouldSupportMultipleBoltConnectorsWithCustomNames() + void shouldSupportMultipleBoltConnectorsWithCustomNames() { Config config = Config.defaults( stringMap( "dbms.connector.bolt1.type", "BOLT", @@ -223,7 +222,7 @@ public void shouldSupportMultipleBoltConnectorsWithCustomNames() } @Test - public void shouldSupportMultipleBoltConnectorsWithDefaultAndCustomName() + void shouldSupportMultipleBoltConnectorsWithDefaultAndCustomName() { Config config = Config.defaults( stringMap( "dbms.connector.bolt.type", "BOLT", @@ -244,7 +243,7 @@ public void shouldSupportMultipleBoltConnectorsWithDefaultAndCustomName() /// JONAS HTTP FOLLOWS @Test - public void testServerDefaultSettings() + void testServerDefaultSettings() { // given Config config = Config.builder().withServerDefaults().build(); @@ -271,7 +270,7 @@ public void testServerDefaultSettings() } @Test - public void shouldBeAbleToDisableHttpConnectorWithJustOneParameter() + void shouldBeAbleToDisableHttpConnectorWithJustOneParameter() { // given Config disableHttpConfig = Config.defaults( @@ -284,7 +283,7 @@ public void shouldBeAbleToDisableHttpConnectorWithJustOneParameter() } @Test - public void shouldBeAbleToOverrideHttpListenAddressWithJustOneParameter() + void shouldBeAbleToOverrideHttpListenAddressWithJustOneParameter() { // given Config config = Config.defaults( stringMap( @@ -301,7 +300,7 @@ public void shouldBeAbleToOverrideHttpListenAddressWithJustOneParameter() } @Test - public void hasDefaultBookmarkAwaitTimeout() + void hasDefaultBookmarkAwaitTimeout() { Config config = Config.defaults(); long bookmarkReadyTimeoutMs = config.get( GraphDatabaseSettings.bookmark_ready_timeout ).toMillis(); @@ -309,7 +308,7 @@ public void hasDefaultBookmarkAwaitTimeout() } @Test - public void shouldBeAbleToOverrideHttpsListenAddressWithJustOneParameter() + void shouldBeAbleToOverrideHttpsListenAddressWithJustOneParameter() { // given Config config = Config.defaults( stringMap( @@ -325,28 +324,22 @@ public void shouldBeAbleToOverrideHttpsListenAddressWithJustOneParameter() } @Test - public void throwsForIllegalBookmarkAwaitTimeout() + void throwsForIllegalBookmarkAwaitTimeout() { String[] illegalValues = { "0ms", "0s", "10ms", "99ms", "999ms", "42ms" }; for ( String value : illegalValues ) { - try + assertThrows( InvalidSettingException.class, () -> { - Config config = Config.defaults( stringMap( - GraphDatabaseSettings.bookmark_ready_timeout.name(), value ) ); + Config config = Config.defaults( stringMap( GraphDatabaseSettings.bookmark_ready_timeout.name(), value ) ); config.get( GraphDatabaseSettings.bookmark_ready_timeout ); - fail( "Exception expected for value '" + value + "'" ); - } - catch ( Exception e ) - { - assertThat( e, instanceOf( InvalidSettingException.class ) ); - } + }, "Exception expected for value '" + value + "'" ); } } @Test - public void shouldDeriveListenAddressFromDefaultListenAddress() + void shouldDeriveListenAddressFromDefaultListenAddress() { // given Config config = Config.fromSettings( stringMap( "dbms.connector.https.enabled", "true", @@ -360,7 +353,7 @@ public void shouldDeriveListenAddressFromDefaultListenAddress() } @Test - public void shouldDeriveListenAddressFromDefaultListenAddressAndSpecifiedPorts() + void shouldDeriveListenAddressFromDefaultListenAddressAndSpecifiedPorts() { // given Config config = Config.defaults( stringMap( "dbms.connector.https.enabled", "true", @@ -389,7 +382,7 @@ public void shouldDeriveListenAddressFromDefaultListenAddressAndSpecifiedPorts() } @Test - public void shouldStillSupportCustomNameForHttpConnector() + void shouldStillSupportCustomNameForHttpConnector() { Config config = Config.defaults( stringMap( "dbms.connector.random_name_that_will_be_unsupported.type", "HTTP", @@ -404,7 +397,7 @@ public void shouldStillSupportCustomNameForHttpConnector() } @Test - public void shouldStillSupportCustomNameForHttpsConnector() + void shouldStillSupportCustomNameForHttpsConnector() { Config config = Config.defaults( stringMap( "dbms.connector.random_name_that_will_be_unsupported.type", "HTTP", @@ -419,7 +412,7 @@ public void shouldStillSupportCustomNameForHttpsConnector() } @Test - public void validateRetentionPolicy() + void validateRetentionPolicy() { String[] validSet = new String[]{"true", "keep_all", "false", "keep_none", "10 files", "10k files", "10K size", "10m txs", @@ -434,14 +427,9 @@ public void validateRetentionPolicy() for ( String invalid : invalidSet ) { - try - { - Config.defaults( keep_logical_logs, invalid ); - fail( "Value \"" + invalid + "\" should be considered invalid" ); - } - catch ( InvalidSettingException ignored ) - { - } + assertThrows( InvalidSettingException.class, () -> Config.defaults( keep_logical_logs, invalid ), + "Value \"" + invalid + "\" should be considered invalid" ); + } } } diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/impl/notification/NotificationCodeTest.java b/community/kernel/src/test/java/org/neo4j/graphdb/impl/notification/NotificationCodeTest.java index a3421bad12ac..b1447ce3c3c6 100644 --- a/community/kernel/src/test/java/org/neo4j/graphdb/impl/notification/NotificationCodeTest.java +++ b/community/kernel/src/test/java/org/neo4j/graphdb/impl/notification/NotificationCodeTest.java @@ -19,7 +19,7 @@ */ package org.neo4j.graphdb.impl.notification; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; @@ -31,16 +31,16 @@ import org.neo4j.graphdb.SeverityLevel; import static org.hamcrest.CoreMatchers.equalTo; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.neo4j.graphdb.impl.notification.NotificationCode.CARTESIAN_PRODUCT; import static org.neo4j.graphdb.impl.notification.NotificationCode.DEPRECATED_PROCEDURE; import static org.neo4j.graphdb.impl.notification.NotificationCode.INDEX_HINT_UNFULFILLABLE; import static org.neo4j.graphdb.impl.notification.NotificationCode.JOIN_HINT_UNFULFILLABLE; -public class NotificationCodeTest +class NotificationCodeTest { @Test - public void shouldConstructNotificationFor_INDEX_HINT_UNFULFILLABLE() + void shouldConstructNotificationFor_INDEX_HINT_UNFULFILLABLE() { NotificationDetail indexDetail = NotificationDetail.Factory.index( "Person", "name" ); Notification notification = INDEX_HINT_UNFULFILLABLE.notification( InputPosition.empty, indexDetail ); @@ -54,7 +54,7 @@ public void shouldConstructNotificationFor_INDEX_HINT_UNFULFILLABLE() } @Test - public void shouldConstructNotificationFor_CARTESIAN_PRODUCT() + void shouldConstructNotificationFor_CARTESIAN_PRODUCT() { Set idents = new TreeSet<>(); idents.add( "n" ); @@ -75,7 +75,7 @@ public void shouldConstructNotificationFor_CARTESIAN_PRODUCT() } @Test - public void shouldConstructNotificationsFor_JOIN_HINT_UNFULFILLABLE() + void shouldConstructNotificationsFor_JOIN_HINT_UNFULFILLABLE() { List idents = new ArrayList<>(); idents.add( "n" ); @@ -94,7 +94,7 @@ public void shouldConstructNotificationsFor_JOIN_HINT_UNFULFILLABLE() } @Test - public void shouldConstructNotificationsFor_DEPRECATED_PROCEDURE() + void shouldConstructNotificationsFor_DEPRECATED_PROCEDURE() { NotificationDetail identifierDetail = NotificationDetail.Factory.deprecatedName("oldName", "newName"); Notification notification = DEPRECATED_PROCEDURE.notification( InputPosition.empty, identifierDetail ); @@ -108,7 +108,7 @@ public void shouldConstructNotificationsFor_DEPRECATED_PROCEDURE() } @Test - public void shouldConstructNotificationsFor_DEPRECATED_PROCEDURE_with_no_newName() + void shouldConstructNotificationsFor_DEPRECATED_PROCEDURE_with_no_newName() { NotificationDetail identifierDetail = NotificationDetail.Factory.deprecatedName("oldName", ""); Notification notification = DEPRECATED_PROCEDURE.notification( InputPosition.empty, identifierDetail ); diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/impl/notification/NotificationDetailTest.java b/community/kernel/src/test/java/org/neo4j/graphdb/impl/notification/NotificationDetailTest.java index 8a1cab965973..3633c07c8b33 100644 --- a/community/kernel/src/test/java/org/neo4j/graphdb/impl/notification/NotificationDetailTest.java +++ b/community/kernel/src/test/java/org/neo4j/graphdb/impl/notification/NotificationDetailTest.java @@ -19,7 +19,7 @@ */ package org.neo4j.graphdb.impl.notification; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.HashSet; @@ -28,12 +28,12 @@ import java.util.TreeSet; import static org.hamcrest.CoreMatchers.equalTo; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; -public class NotificationDetailTest +class NotificationDetailTest { @Test - public void shouldConstructIndexDetails() + void shouldConstructIndexDetails() { NotificationDetail detail = NotificationDetail.Factory.index( "Person", "name" ); @@ -43,7 +43,7 @@ public void shouldConstructIndexDetails() } @Test - public void shouldConstructSuboptimalIndexDetails() + void shouldConstructSuboptimalIndexDetails() { NotificationDetail detail = NotificationDetail.Factory.suboptimalIndex( "Person", "name" ); @@ -53,7 +53,7 @@ public void shouldConstructSuboptimalIndexDetails() } @Test - public void shouldConstructCartesianProductDetailsSingular() + void shouldConstructCartesianProductDetailsSingular() { Set idents = new HashSet<>(); idents.add( "n" ); @@ -65,7 +65,7 @@ public void shouldConstructCartesianProductDetailsSingular() } @Test - public void shouldConstructCartesianProductDetails() + void shouldConstructCartesianProductDetails() { Set idents = new TreeSet<>(); idents.add( "n" ); @@ -78,7 +78,7 @@ public void shouldConstructCartesianProductDetails() } @Test - public void shouldConstructJoinHintDetailsSingular() + void shouldConstructJoinHintDetailsSingular() { List idents = new ArrayList<>(); idents.add( "n" ); @@ -90,7 +90,7 @@ public void shouldConstructJoinHintDetailsSingular() } @Test - public void shouldConstructJoinHintDetails() + void shouldConstructJoinHintDetails() { List idents = new ArrayList<>(); idents.add( "n" ); diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/index/UniqueFactoryTest.java b/community/kernel/src/test/java/org/neo4j/graphdb/index/UniqueFactoryTest.java index 22ae4e8e4ae6..500d0d08772e 100644 --- a/community/kernel/src/test/java/org/neo4j/graphdb/index/UniqueFactoryTest.java +++ b/community/kernel/src/test/java/org/neo4j/graphdb/index/UniqueFactoryTest.java @@ -19,7 +19,7 @@ */ package org.neo4j.graphdb.index; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Collections; import java.util.Map; @@ -30,20 +30,20 @@ import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.index.UniqueFactory.UniqueEntity; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -public class UniqueFactoryTest +class UniqueFactoryTest { @Test - public void shouldUseConcurrentlyCreatedNode() + void shouldUseConcurrentlyCreatedNode() { // given GraphDatabaseService graphdb = mock( GraphDatabaseService.class ); @@ -62,7 +62,7 @@ public void shouldUseConcurrentlyCreatedNode() UniqueFactory.UniqueNodeFactory unique = new UniqueFactory.UniqueNodeFactory( index ) { @Override - protected void initialize( Node created, Map properties ) + protected void initialize( Node created, Map properties ) { fail( "we did not create the node, so it should not be initialized" ); } @@ -81,7 +81,7 @@ protected void initialize( Node created, Map properties ) } @Test - public void shouldCreateNodeAndIndexItIfMissing() + void shouldCreateNodeAndIndexItIfMissing() { // given GraphDatabaseService graphdb = mock( GraphDatabaseService.class ); @@ -116,11 +116,11 @@ protected void initialize( Node created, Map properties ) verify( index ).putIfAbsent( indexedNode, "key1", "value1" ); verify( graphdb, times( 1 ) ).createNode(); verify( tx ).success(); - assertTrue( "Node not initialized", initializeCalled.get() ); + assertTrue( initializeCalled.get(), "Node not initialized" ); } @Test - public void shouldCreateNodeWithOutcomeAndIndexItIfMissing() + void shouldCreateNodeWithOutcomeAndIndexItIfMissing() { // given GraphDatabaseService graphdb = mock( GraphDatabaseService.class ); @@ -156,11 +156,11 @@ protected void initialize( Node created, Map properties ) verify( index ).putIfAbsent( indexedNode, "key1", "value1" ); verify( graphdb, times( 1 ) ).createNode(); verify( tx ).success(); - assertTrue( "Node not initialized", initializeCalled.get() ); + assertTrue( initializeCalled.get(), "Node not initialized" ); } @Test - public void shouldNotTouchTransactionsIfAlreadyInIndex() + void shouldNotTouchTransactionsIfAlreadyInIndex() { GraphDatabaseService graphdb = mock( GraphDatabaseService.class ); @SuppressWarnings( "unchecked" ) diff --git a/community/kernel/src/test/java/org/neo4j/helpers/ArgsTest.java b/community/kernel/src/test/java/org/neo4j/helpers/ArgsTest.java index 26bb9ae56efc..39b93abfd6b6 100644 --- a/community/kernel/src/test/java/org/neo4j/helpers/ArgsTest.java +++ b/community/kernel/src/test/java/org/neo4j/helpers/ArgsTest.java @@ -19,14 +19,14 @@ */ package org.neo4j.helpers; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -public class ArgsTest +class ArgsTest { @Test - public void shouldInterpretSingleDashAsValue() + void shouldInterpretSingleDashAsValue() { // GIVEN Args args = Args.parse( "-test", "-" ); diff --git a/community/kernel/src/test/java/org/neo4j/helpers/ArrayUtilTest.java b/community/kernel/src/test/java/org/neo4j/helpers/ArrayUtilTest.java index 080ac8b478c0..dcf442287ed9 100644 --- a/community/kernel/src/test/java/org/neo4j/helpers/ArrayUtilTest.java +++ b/community/kernel/src/test/java/org/neo4j/helpers/ArrayUtilTest.java @@ -19,18 +19,18 @@ */ package org.neo4j.helpers; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.neo4j.helpers.collection.Iterators.asSet; -public class ArrayUtilTest +class ArrayUtilTest { @Test - public void shouldProduceUnionOfTwoArrays() + void shouldProduceUnionOfTwoArrays() { // GIVEN String[] first = {"one", "three"}; @@ -45,7 +45,7 @@ public void shouldProduceUnionOfTwoArrays() } @Test - public void shouldProduceUnionWhereFirstIsNull() + void shouldProduceUnionWhereFirstIsNull() { // GIVEN String[] first = null; @@ -59,7 +59,7 @@ public void shouldProduceUnionWhereFirstIsNull() } @Test - public void shouldProduceUnionWhereOtherIsNull() + void shouldProduceUnionWhereOtherIsNull() { // GIVEN String[] first = {"one", "two"}; @@ -73,7 +73,7 @@ public void shouldProduceUnionWhereOtherIsNull() } @Test - public void shouldCheckNullSafeEqual() + void shouldCheckNullSafeEqual() { // WHEN/THEN assertTrue( ArrayUtil.nullSafeEquals( null, null ) ); @@ -83,7 +83,7 @@ public void shouldCheckNullSafeEqual() } @Test - public void emptyArray() + void emptyArray() { assertTrue( ArrayUtil.isEmpty( null ) ); assertTrue( ArrayUtil.isEmpty( new String[] {} ) ); @@ -91,7 +91,7 @@ public void emptyArray() } @Test - public void shouldConcatOneAndMany() + void shouldConcatOneAndMany() { // WHEN Integer[] result = ArrayUtil.concat( 0, 1, 2, 3, 4 ); @@ -104,7 +104,7 @@ public void shouldConcatOneAndMany() } @Test - public void shouldConcatSeveralArrays() + void shouldConcatSeveralArrays() { // GIVEN Integer[] a = {0, 1, 2}; @@ -124,7 +124,7 @@ public void shouldConcatSeveralArrays() } @Test - public void shouldFindIndexOf() + void shouldFindIndexOf() { // GIVEN Integer[] numbers = ArrayUtil.concat( 0, 1, 2, 3, 4, 5 ); @@ -137,7 +137,7 @@ public void shouldFindIndexOf() } @Test - public void shouldFindLastOf() + void shouldFindLastOf() { // GIVEN Integer[] numbers = new Integer[]{0, 100, 4, 5, 6, 3}; @@ -147,7 +147,7 @@ public void shouldFindLastOf() } @Test - public void shouldRemoveItems() + void shouldRemoveItems() { // GIVEN Integer[] numbers = ArrayUtil.concat( 0, 1, 2, 3, 4, 5 ); @@ -168,7 +168,7 @@ public void shouldRemoveItems() } @Test - public void shouldConcatArrays() + void shouldConcatArrays() { // GIVEN Integer[] initial = new Integer[] {0, 1, 2}; @@ -181,7 +181,7 @@ public void shouldConcatArrays() } @Test - public void shouldReverseEvenCount() + void shouldReverseEvenCount() { // given Integer[] array = new Integer[] {0, 1, 2, 3, 4, 5}; @@ -194,7 +194,7 @@ public void shouldReverseEvenCount() } @Test - public void shouldReverseUnevenCount() + void shouldReverseUnevenCount() { // given Integer[] array = new Integer[] {0, 1, 2, 3, 4}; @@ -207,7 +207,7 @@ public void shouldReverseUnevenCount() } @Test - public void shouldReverseEmptyArray() + void shouldReverseEmptyArray() { // given Integer[] array = new Integer[] {}; diff --git a/community/kernel/src/test/java/org/neo4j/helpers/FormatTest.java b/community/kernel/src/test/java/org/neo4j/helpers/FormatTest.java index c4c834d70098..1145cfeca159 100644 --- a/community/kernel/src/test/java/org/neo4j/helpers/FormatTest.java +++ b/community/kernel/src/test/java/org/neo4j/helpers/FormatTest.java @@ -19,18 +19,19 @@ */ package org.neo4j.helpers; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static java.util.concurrent.TimeUnit.MINUTES; import static java.util.concurrent.TimeUnit.SECONDS; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.neo4j.helpers.Format.duration; -public class FormatTest +class FormatTest { @Test - public void shouldDisplayBytes() + void shouldDisplayBytes() { // when String format = Format.bytes( 123 ); @@ -41,7 +42,7 @@ public void shouldDisplayBytes() } @Test - public void shouldDisplayKiloBytes() + void shouldDisplayKiloBytes() { // when String format = Format.bytes( 1_234 ); @@ -52,7 +53,7 @@ public void shouldDisplayKiloBytes() } @Test - public void shouldDisplayMegaBytes() + void shouldDisplayMegaBytes() { // when String format = Format.bytes( 1_234_567 ); @@ -63,7 +64,7 @@ public void shouldDisplayMegaBytes() } @Test - public void shouldDisplayGigaBytes() + void shouldDisplayGigaBytes() { // when String format = Format.bytes( 1_234_567_890 ); @@ -74,7 +75,7 @@ public void shouldDisplayGigaBytes() } @Test - public void shouldDisplayPlainCount() + void shouldDisplayPlainCount() { // when String format = Format.count( 10 ); @@ -84,7 +85,7 @@ public void shouldDisplayPlainCount() } @Test - public void shouldDisplayThousandCount() + void shouldDisplayThousandCount() { // when String format = Format.count( 2_000 ); @@ -95,7 +96,7 @@ public void shouldDisplayThousandCount() } @Test - public void shouldDisplayMillionCount() + void shouldDisplayMillionCount() { // when String format = Format.count( 2_000_000 ); @@ -106,7 +107,7 @@ public void shouldDisplayMillionCount() } @Test - public void shouldDisplayBillionCount() + void shouldDisplayBillionCount() { // when String format = Format.count( 2_000_000_000 ); @@ -117,7 +118,7 @@ public void shouldDisplayBillionCount() } @Test - public void shouldDisplayTrillionCount() + void shouldDisplayTrillionCount() { // when String format = Format.count( 4_000_000_000_000L ); @@ -128,10 +129,10 @@ public void shouldDisplayTrillionCount() } @Test - public void displayDuration() + void displayDuration() { - assertThat( Format.duration( MINUTES.toMillis( 1 ) + SECONDS.toMillis( 2 ) ), is( "1m 2s" ) ); - assertThat( Format.duration( 42 ), is( "42ms" ) ); - assertThat( Format.duration( 0 ), is( "0ms" ) ); + assertThat( duration( MINUTES.toMillis( 1 ) + SECONDS.toMillis( 2 ) ), is( "1m 2s" ) ); + assertThat( duration( 42 ), is( "42ms" ) ); + assertThat( duration( 0 ), is( "0ms" ) ); } } diff --git a/community/kernel/src/test/java/org/neo4j/helpers/HostnamePortTest.java b/community/kernel/src/test/java/org/neo4j/helpers/HostnamePortTest.java index b98a2af173b5..b8626ef36096 100644 --- a/community/kernel/src/test/java/org/neo4j/helpers/HostnamePortTest.java +++ b/community/kernel/src/test/java/org/neo4j/helpers/HostnamePortTest.java @@ -19,25 +19,26 @@ */ package org.neo4j.helpers; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.net.InetAddress; import java.net.URI; import java.net.UnknownHostException; import static org.hamcrest.CoreMatchers.equalTo; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.junit.Assume.assumeFalse; -import static org.junit.Assume.assumeTrue; - -public class HostnamePortTest +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assumptions.assumeFalse; + +class HostnamePortTest { @Test - public void testHostnameOnly() + void testHostnameOnly() { HostnamePort hostnamePort = new HostnamePort( "myhost" ); assertThat( hostnamePort.getHost(), equalTo( "myhost" ) ); @@ -46,7 +47,7 @@ public void testHostnameOnly() } @Test - public void testHostnamePort() + void testHostnamePort() { HostnamePort hostnamePort = new HostnamePort( "myhost:1234" ); assertThat( hostnamePort.getHost(), equalTo( "myhost" ) ); @@ -55,7 +56,7 @@ public void testHostnamePort() } @Test - public void testHostnamePortRange() + void testHostnamePortRange() { HostnamePort hostnamePort = new HostnamePort( "myhost:1234-1243" ); assertThat( hostnamePort.getHost(), equalTo( "myhost" ) ); @@ -64,7 +65,7 @@ public void testHostnamePortRange() } @Test - public void testHostnamePortRangeInversed() + void testHostnamePortRangeInversed() { HostnamePort hostnamePort = new HostnamePort( "myhost:1243-1234" ); assertThat( hostnamePort.getHost(), equalTo( "myhost" ) ); @@ -73,7 +74,7 @@ public void testHostnamePortRangeInversed() } @Test - public void testSinglePortOnly() + void testSinglePortOnly() { HostnamePort hostnamePort = new HostnamePort( ":1234" ); assertNull( hostnamePort.getHost() ); @@ -82,7 +83,7 @@ public void testSinglePortOnly() } @Test - public void testPortRangeOnly() + void testPortRangeOnly() { HostnamePort hostnamePort = new HostnamePort( ":1230-1240" ); assertNull( hostnamePort.getHost() ); @@ -91,14 +92,14 @@ public void testPortRangeOnly() } @Test - public void testDefaultHost() + void testDefaultHost() { HostnamePort hostnamePort = new HostnamePort( ":1234" ); assertThat( hostnamePort.getHost( "1.2.3.4" ), equalTo( "1.2.3.4" ) ); } @Test - public void testGetHostAddress() throws Exception + void testGetHostAddress() throws Exception { // Given String hostName = InetAddress.getLocalHost().getHostName(); @@ -114,58 +115,27 @@ public void testGetHostAddress() throws Exception } @Test - public void testGetHostAddressUnknown() + void testGetHostAddressUnknown() { // Given String unknownHost = "unknownHost"; - boolean unknownHostUnknown = false; - try - { - InetAddress.getByName( unknownHost ); - } - catch ( UnknownHostException e ) - { - unknownHostUnknown = true; - } - // this checks if hypothesis is actually true - assumeTrue( unknownHostUnknown ); - - // When & Then + assertThrows( UnknownHostException.class, () -> InetAddress.getByName( unknownHost ) ); // should return hostname when it is unknown assertThat( HostnamePort.getHostAddress( unknownHost, "default" ), equalTo( unknownHost ) ); } @Test - public void testMatchesUnknownHosts() throws Exception + void testMatchesUnknownHosts() throws Exception { // Given String knownHost = InetAddress.getLocalHost().getHostName(); String unknownHost1 = "unknownHost1"; String unknownHost2 = "unknownHost2"; - boolean unknownHost1Unknown = false; - try - { - InetAddress.getByName( unknownHost1 ); - } - catch ( UnknownHostException e ) - { - unknownHost1Unknown = true; - } - - boolean unknownHost2Unknown = false; - try - { - InetAddress.getByName( unknownHost2 ); - } - catch ( UnknownHostException e ) - { - unknownHost2Unknown = true; - } - // skipping if they're not unknown: test doesn't make sense - assumeTrue( unknownHost1Unknown && unknownHost2Unknown); + assertThrows( UnknownHostException.class, () -> InetAddress.getByName( unknownHost1 ) ); + assertThrows( UnknownHostException.class, () -> InetAddress.getByName( unknownHost2 ) ); HostnamePort hostnamePortSinglePort = new HostnamePort( unknownHost1 + ":1234" ); HostnamePort hostnamePortWithRange = new HostnamePort( unknownHost1 + ":1234-1236" ); @@ -201,11 +171,10 @@ public void testMatchesUnknownHosts() throws Exception // Should not match, no port assertFalse( hostnamePortWithRange.matches( URI.create( "ha://" + unknownHost1 ) ) ); assertFalse( hostnamePortWithRange.matches( URI.create( "ha://" + unknownHost2 ) ) ); - } @Test - public void testMatchesKnownHostWithIP() throws Exception + void testMatchesKnownHostWithIP() throws Exception { // Given @@ -252,24 +221,14 @@ public void testMatchesKnownHostWithIP() throws Exception } @Test - public void testMatchesIPWithHost() throws Exception + void testMatchesIPWithHost() throws Exception { // Given - String hostname1 = InetAddress.getLocalHost().getHostName(); String host1 = InetAddress.getLocalHost().getHostAddress(); String hostname2 = "neo4j.org"; - boolean host2Known = true; - try - { - InetAddress.getByName( hostname2 ); - } - catch ( UnknownHostException e ) - { - host2Known = false; - } - assumeTrue( host2Known ); + assertDoesNotThrow( () -> InetAddress.getByName( hostname2 ) ); assumeFalse( hostname1.equals( hostname2 ) ); HostnamePort hostnamePortSinglePort = new HostnamePort( host1 + ":1234" ); @@ -304,22 +263,13 @@ public void testMatchesIPWithHost() throws Exception } @Test - public void testMatchesIPWithHostUnknown() throws Exception + void testMatchesIPWithHostUnknown() throws Exception { // Given - String unknownHost = "unknownHost"; - boolean unknownHostUnknown = false; - try - { - InetAddress.getByName( unknownHost ); - } - catch ( UnknownHostException e ) - { - unknownHostUnknown = true; - } - assumeTrue( unknownHostUnknown ); + String unknownHost = "unknownHost"; + assertThrows( UnknownHostException.class, () -> InetAddress.getByName( unknownHost ) ); - String host1 = InetAddress.getLocalHost().getHostAddress(); + String host1 = InetAddress.getLocalHost().getHostAddress(); HostnamePort hostnamePortSinglePort = new HostnamePort( host1 + ":1234" ); HostnamePort hostnamePortWithRange = new HostnamePort( host1 + ":1234-1236" ); @@ -334,7 +284,7 @@ public void testMatchesIPWithHostUnknown() throws Exception } @Test - public void testMatchesKnownHostWithHost() throws Exception + void testMatchesKnownHostWithHost() throws Exception { // Given @@ -342,16 +292,7 @@ public void testMatchesKnownHostWithHost() throws Exception // any other hostname? String host2 = "neo4j.org"; - boolean host2Known = true; - try - { - InetAddress.getByName( host2 ); - } - catch ( UnknownHostException e ) - { - host2Known = false; - } - assumeTrue( host2Known ); + assertDoesNotThrow( () -> InetAddress.getByName( host2 ) ); assumeFalse( host1.equals( host2 ) ); HostnamePort hostnamePortSinglePort = new HostnamePort( host1 + ":1234" ); @@ -386,22 +327,13 @@ public void testMatchesKnownHostWithHost() throws Exception } @Test - public void testMatchesKnownHostWithHostUnknown() throws Exception + void testMatchesKnownHostWithHostUnknown() throws Exception { // Given String host1 = InetAddress.getLocalHost().getHostName(); String unknownHost = "unknownHost"; - boolean unknownHostUnknown = false; - try - { - InetAddress.getByName( unknownHost ); - } - catch ( UnknownHostException e ) - { - unknownHostUnknown = true; - } - assumeTrue( unknownHostUnknown ); + assertThrows( UnknownHostException.class, () -> InetAddress.getByName( unknownHost ) ); HostnamePort hostnamePortSinglePort = new HostnamePort( host1 + ":1234" ); HostnamePort hostnamePortWithRange = new HostnamePort( host1 + ":1234-1236" ); @@ -416,7 +348,7 @@ public void testMatchesKnownHostWithHostUnknown() throws Exception } @Test - public void testMatchesIP() + void testMatchesIP() { // Given @@ -451,30 +383,19 @@ public void testMatchesIP() } @Test - public void testMatchesNullHostWithUnknownHost() + void testMatchesNullHostWithUnknownHost() { // Given - HostnamePort hostnamePortSinglePort = new HostnamePort( ":1234" ); String unknownHost = "unknownHost"; - boolean unknownHostUnknown = false; - try - { - InetAddress.getByName( unknownHost ); - } - catch ( UnknownHostException e ) - { - unknownHostUnknown = true; - } - assumeTrue( unknownHostUnknown ); - + assertThrows( UnknownHostException.class, () -> InetAddress.getByName( unknownHost ) ); // When & Then assertFalse( hostnamePortSinglePort.matches( URI.create( "ha://" + unknownHost + ":1234" ) ) ); } @Test - public void testMatchesNullHostWithIP() throws Exception + void testMatchesNullHostWithIP() throws Exception { HostnamePort hostnamePortSinglePort = new HostnamePort( ":1234" ); String host1IP = InetAddress.getLocalHost().getHostAddress(); @@ -483,7 +404,7 @@ public void testMatchesNullHostWithIP() throws Exception } @Test - public void testMatchesNullHostWithKnownHost() throws Exception + void testMatchesNullHostWithKnownHost() throws Exception { HostnamePort hostnamePortSinglePort = new HostnamePort( ":1234" ); String host1 = InetAddress.getLocalHost().getHostName(); @@ -492,7 +413,7 @@ public void testMatchesNullHostWithKnownHost() throws Exception } @Test - public void testIPv6Address() + void testIPv6Address() { HostnamePort hostnamePort = new HostnamePort( "[2001:cdba:0:0:0:0:3257:9652]" ); @@ -502,7 +423,7 @@ public void testIPv6Address() } @Test - public void testIPv6AddressWithSchemeAndPort() + void testIPv6AddressWithSchemeAndPort() { HostnamePort hostnamePort = new HostnamePort( "foo://[ff02::1:1]:9191" ); @@ -512,7 +433,7 @@ public void testIPv6AddressWithSchemeAndPort() } @Test - public void testIPv6Localhost() + void testIPv6Localhost() { HostnamePort hostnamePort = new HostnamePort( "[::1]" ); @@ -522,7 +443,7 @@ public void testIPv6Localhost() } @Test - public void testIPv6LocalhostWithSchemeAndPort() + void testIPv6LocalhostWithSchemeAndPort() { HostnamePort hostnamePort = new HostnamePort( "foo://[::1]:6362" ); diff --git a/community/kernel/src/test/java/org/neo4j/helpers/ListenersTest.java b/community/kernel/src/test/java/org/neo4j/helpers/ListenersTest.java index 4ecfffe75857..e32dcc7089e0 100644 --- a/community/kernel/src/test/java/org/neo4j/helpers/ListenersTest.java +++ b/community/kernel/src/test/java/org/neo4j/helpers/ListenersTest.java @@ -19,7 +19,7 @@ */ package org.neo4j.helpers; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.concurrent.ExecutorService; @@ -30,22 +30,23 @@ import static java.lang.Thread.currentThread; import static java.util.Collections.singletonList; import static java.util.concurrent.Executors.newSingleThreadExecutor; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.startsWith; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.neo4j.helpers.NamedThreadFactory.named; -public class ListenersTest +class ListenersTest { - @Test( expected = NullPointerException.class ) - public void copyConstructorWithNull() + @Test + void copyConstructorWithNull() { - new Listeners<>( null ); + assertThrows( NullPointerException.class, () -> new Listeners<>( null ) ); } @Test - public void copyConstructor() + void copyConstructor() { Listeners original = newListeners( new Listener(), new Listener(), new Listener() ); @@ -54,14 +55,14 @@ public void copyConstructor() assertEquals( Iterables.asList( original ), Iterables.asList( copy ) ); } - @Test( expected = NullPointerException.class ) - public void addNull() + @Test + void addNull() { - new Listeners<>().add( null ); + assertThrows( NullPointerException.class, () -> new Listeners<>().add( null ) ); } @Test - public void add() + void add() { Listener[] listenersArray = {new Listener(), new Listener(), new Listener()}; @@ -70,14 +71,14 @@ public void add() assertArrayEquals( listenersArray, Iterables.asArray( Listener.class, listeners ) ); } - @Test( expected = NullPointerException.class ) - public void removeNull() + @Test + void removeNull() { - new Listeners<>().remove( null ); + assertThrows( NullPointerException.class, () -> new Listeners<>().remove( null ) ); } @Test - public void remove() + void remove() { Listener listener1 = new Listener(); Listener listener2 = new Listener(); @@ -94,14 +95,14 @@ public void remove() assertEquals( singletonList( listener2 ), Iterables.asList( listeners ) ); } - @Test( expected = NullPointerException.class ) - public void notifyWithNullNotification() + @Test + void notifyWithNullNotification() { - new Listeners<>().notify( null ); + assertThrows( NullPointerException.class, () -> new Listeners<>().notify( null ) ); } @Test - public void notifyWithNotification() + void notifyWithNotification() { String message = "foo"; Listener listener1 = new Listener(); @@ -118,26 +119,26 @@ public void notifyWithNotification() assertEquals( currentThread().getName(), listener2.threadName ); } - @Test( expected = NullPointerException.class ) - public void notifyWithNullExecutorAndNullNotification() + @Test + void notifyWithNullExecutorAndNullNotification() { - new Listeners<>().notify( null, null ); + assertThrows( NullPointerException.class, () -> new Listeners<>().notify( null, null ) ); } - @Test( expected = NullPointerException.class ) - public void notifyWithNullExecutorAndNotification() + @Test + void notifyWithNullExecutorAndNotification() { - new Listeners().notify( null, listener -> listener.process( "foo" ) ); + assertThrows( NullPointerException.class, () -> new Listeners().notify( null, listener -> listener.process( "foo" ) ) ); } - @Test( expected = NullPointerException.class ) - public void notifyWithExecutorAndNullNotification() + @Test + void notifyWithExecutorAndNullNotification() { - new Listeners().notify( newSingleThreadExecutor(), null ); + assertThrows( NullPointerException.class, () -> new Listeners().notify( newSingleThreadExecutor(), null ) ); } @Test - public void notifyWithExecutorAndNotification() throws Exception + void notifyWithExecutorAndNotification() throws Exception { String message = "foo"; String threadNamePrefix = "test-thread"; @@ -159,7 +160,7 @@ public void notifyWithExecutorAndNotification() throws Exception } @Test - public void listenersIterable() + void listenersIterable() { Listener listener1 = new Listener(); Listener listener2 = new Listener(); diff --git a/community/kernel/src/test/java/org/neo4j/helpers/MathUtilTest.java b/community/kernel/src/test/java/org/neo4j/helpers/MathUtilTest.java index 9464d8f8fcf3..8af07755851a 100644 --- a/community/kernel/src/test/java/org/neo4j/helpers/MathUtilTest.java +++ b/community/kernel/src/test/java/org/neo4j/helpers/MathUtilTest.java @@ -19,21 +19,21 @@ */ package org.neo4j.helpers; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.neo4j.helpers.MathUtil.numbersEqual; -public class MathUtilTest +class MathUtilTest { @Test - public void numbersEqualShouldAlwaysBeFalseWhenComparingAgainstDoubleNaN() + void numbersEqualShouldAlwaysBeFalseWhenComparingAgainstDoubleNaN() { assertFalse( numbersEqual( Double.NaN, 0 ) ); } @Test - public void numbersEqualShouldAlwaysBeFalseWhenComparingAgainstInfinities() + void numbersEqualShouldAlwaysBeFalseWhenComparingAgainstInfinities() { assertFalse( numbersEqual( Double.NEGATIVE_INFINITY, Long.MIN_VALUE ) ); assertFalse( numbersEqual( Double.POSITIVE_INFINITY, Long.MAX_VALUE ) ); diff --git a/community/kernel/src/test/java/org/neo4j/helpers/ServiceTest.java b/community/kernel/src/test/java/org/neo4j/helpers/ServiceTest.java index 93097b107e9b..cdf851a98525 100644 --- a/community/kernel/src/test/java/org/neo4j/helpers/ServiceTest.java +++ b/community/kernel/src/test/java/org/neo4j/helpers/ServiceTest.java @@ -19,7 +19,9 @@ */ package org.neo4j.helpers; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.io.InputStream; @@ -27,70 +29,57 @@ import java.util.Collections; import java.util.Enumeration; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import org.neo4j.helpers.collection.Iterables; -public class ServiceTest +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +class ServiceTest { + private ClassLoader contextClassLoader; + + @BeforeEach + void setUp() + { + contextClassLoader = Thread.currentThread().getContextClassLoader(); + } + + @AfterEach + void tearDown() + { + Thread.currentThread().setContextClassLoader( contextClassLoader ); + } + @Test - public void shouldLoadServiceInDefaultEnvironment() + void shouldLoadServiceInDefaultEnvironment() { FooService fooService = Service.load( FooService.class, "foo" ); assertTrue( fooService instanceof BarService ); } @Test - public void whenContextCallsLoaderBlocksServicesFolderShouldLoadClassFromKernelClassloader() + void whenContextCallsLoaderBlocksServicesFolderShouldLoadClassFromKernelClassloader() { - ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); - try - { - Thread.currentThread().setContextClassLoader( new ServiceBlockClassLoader( contextClassLoader ) ); - FooService fooService = Service.load( FooService.class, "foo" ); - assertTrue( fooService instanceof BarService ); - } - finally - { - Thread.currentThread().setContextClassLoader( contextClassLoader ); - } + Thread.currentThread().setContextClassLoader( new ServiceBlockClassLoader( contextClassLoader ) ); + FooService fooService = Service.load( FooService.class, "foo" ); + assertTrue( fooService instanceof BarService ); } @Test - public void whenContextClassLoaderOverridesServiceShouldLoadThatClass() + void whenContextClassLoaderOverridesServiceShouldLoadThatClass() { - ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); - try - { - Thread.currentThread().setContextClassLoader( new ServiceRedirectClassLoader( contextClassLoader ) ); - FooService fooService = Service.load( FooService.class, "foo" ); - assertTrue( fooService instanceof BazService ); - } - finally - { - Thread.currentThread().setContextClassLoader( contextClassLoader ); - } + Thread.currentThread().setContextClassLoader( new ServiceRedirectClassLoader( contextClassLoader ) ); + FooService fooService = Service.load( FooService.class, "foo" ); + assertTrue( fooService instanceof BazService ); } @Test - public void whenContextClassLoaderDuplicatesServiceShouldLoadItOnce() + void whenContextClassLoaderDuplicatesServiceShouldLoadItOnce() { - ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); - try - { - Thread.currentThread().setContextClassLoader( Service.class.getClassLoader() ); - Iterable services = Service.load( FooService.class ); - int size = 0; - for ( FooService fooService : services ) - { - size++; - } - assertEquals( 1, size ); - } - finally - { - Thread.currentThread().setContextClassLoader( contextClassLoader ); - } + Thread.currentThread().setContextClassLoader( Service.class.getClassLoader() ); + Iterable services = Service.load( FooService.class ); + assertEquals( 1, Iterables.count( services ) ); } private static final class ServiceBlockClassLoader extends ClassLoader diff --git a/community/kernel/src/test/java/org/neo4j/helpers/SocketAddressParserTest.java b/community/kernel/src/test/java/org/neo4j/helpers/SocketAddressParserTest.java index 7f71f12c6008..c1a31a375a4b 100644 --- a/community/kernel/src/test/java/org/neo4j/helpers/SocketAddressParserTest.java +++ b/community/kernel/src/test/java/org/neo4j/helpers/SocketAddressParserTest.java @@ -19,17 +19,18 @@ */ package org.neo4j.helpers; -import org.junit.Test; +import org.apache.commons.lang3.StringUtils; +import org.junit.jupiter.api.Test; -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.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; -public class SocketAddressParserTest +class SocketAddressParserTest { @Test - public void shouldCreateAdvertisedSocketAddressWithLeadingWhitespace() + void shouldCreateAdvertisedSocketAddressWithLeadingWhitespace() { // given String addressString = whitespace( 1 ) + "localhost:9999"; @@ -43,7 +44,7 @@ public void shouldCreateAdvertisedSocketAddressWithLeadingWhitespace() } @Test - public void shouldCreateAdvertisedSocketAddressWithTrailingWhitespace() + void shouldCreateAdvertisedSocketAddressWithTrailingWhitespace() { // given String addressString = "localhost:9999" + whitespace( 2 ); @@ -57,52 +58,28 @@ public void shouldCreateAdvertisedSocketAddressWithTrailingWhitespace() } @Test - public void shouldFailToCreateSocketAddressWithMixedInWhitespace() + void shouldFailToCreateSocketAddressWithMixedInWhitespace() { String addressString = "localhost" + whitespace( 1 ) + ":9999"; - try - { - SocketAddressParser.socketAddress( addressString, SocketAddress::new ); - fail( "Should have thrown an exception" ); - } - catch ( IllegalArgumentException e ) - { - // expected - } + assertThrows( IllegalArgumentException.class, () -> SocketAddressParser.socketAddress( addressString, SocketAddress::new ) ); } @Test - public void shouldFailToCreateSocketWithTrailingNonNumbers() + void shouldFailToCreateSocketWithTrailingNonNumbers() { String addressString = "localhost:9999abc"; - try - { - SocketAddressParser.socketAddress( addressString, SocketAddress::new ); - fail( "Should have thrown an exception" ); - } - catch ( IllegalArgumentException e ) - { - // expected - } + assertThrows( IllegalArgumentException.class, () -> SocketAddressParser.socketAddress( addressString, SocketAddress::new ) ); } @Test - public void shouldFailOnMissingPort() + void shouldFailOnMissingPort() { String addressString = "localhost:"; - try - { - SocketAddressParser.socketAddress( addressString, SocketAddress::new ); - fail( "Should have thrown an exception" ); - } - catch ( IllegalArgumentException e ) - { - // expected - } + assertThrows( IllegalArgumentException.class, () -> SocketAddressParser.socketAddress( addressString, SocketAddress::new ) ); } @Test - public void shouldSupportDomainNameWithPort() + void shouldSupportDomainNameWithPort() { SocketAddress socketAddress = SocketAddressParser.socketAddress( "my.domain:123", SocketAddress::new ); @@ -112,7 +89,7 @@ public void shouldSupportDomainNameWithPort() } @Test - public void shouldSupportWildcardWithPort() + void shouldSupportWildcardWithPort() { SocketAddress socketAddress = SocketAddressParser.socketAddress( "0.0.0.0:123", SocketAddress::new ); @@ -123,7 +100,7 @@ public void shouldSupportWildcardWithPort() } @Test - public void shouldSupportPortOnly() + void shouldSupportPortOnly() { SocketAddress socketAddress = SocketAddressParser.deriveSocketAddress( "setting.name", ":123", "my.domain", 456, SocketAddress::new ); @@ -135,7 +112,7 @@ public void shouldSupportPortOnly() } @Test - public void shouldSupportDefaultValue() + void shouldSupportDefaultValue() { SocketAddress socketAddress = SocketAddressParser.deriveSocketAddress( "setting.name", null, "my.domain", 456, SocketAddress::new ); @@ -147,7 +124,7 @@ public void shouldSupportDefaultValue() } @Test - public void shouldSupportDefaultWildcard() + void shouldSupportDefaultWildcard() { SocketAddress socketAddress = SocketAddressParser.deriveSocketAddress( "setting.name", null, "0.0.0.0", 456, SocketAddress::new ); @@ -159,7 +136,7 @@ public void shouldSupportDefaultWildcard() } @Test - public void shouldSupportDefaultIPv6Wildcard() + void shouldSupportDefaultIPv6Wildcard() { SocketAddress socketAddress = SocketAddressParser.deriveSocketAddress( "setting.name", null, "::", 456, SocketAddress::new ); @@ -171,7 +148,7 @@ public void shouldSupportDefaultIPv6Wildcard() } @Test - public void shouldSupportDefaultIPv6Value() + void shouldSupportDefaultIPv6Value() { SocketAddress socketAddress = SocketAddressParser.deriveSocketAddress( "setting.name", null, "fe80:1:2::4", 456, SocketAddress::new ); @@ -183,7 +160,7 @@ public void shouldSupportDefaultIPv6Value() } @Test - public void shouldNotUseDefaultsWhenSettingValueSupplied() + void shouldNotUseDefaultsWhenSettingValueSupplied() { SocketAddress socketAddress = SocketAddressParser.deriveSocketAddress( "setting.name", "[fe80:3:4::6]:456", "fe80:1:2::4", 123, SocketAddress::new ); @@ -195,7 +172,7 @@ public void shouldNotUseDefaultsWhenSettingValueSupplied() } @Test - public void shouldSupportIPv6Wildcard() + void shouldSupportIPv6Wildcard() { SocketAddress socketAddress = SocketAddressParser.socketAddress( "[::]:123", SocketAddress::new ); @@ -206,7 +183,7 @@ public void shouldSupportIPv6Wildcard() } @Test - public void shouldSupportIPv6Localhost() + void shouldSupportIPv6Localhost() { SocketAddress socketAddress = SocketAddressParser.socketAddress( "[::1]:123", SocketAddress::new ); @@ -217,7 +194,7 @@ public void shouldSupportIPv6Localhost() } @Test - public void shouldSupportIPv6WithZoneId() + void shouldSupportIPv6WithZoneId() { SocketAddress socketAddress = SocketAddressParser.socketAddress( "[fe80::b279:2f%en0]:123", SocketAddress::new ); @@ -228,7 +205,7 @@ public void shouldSupportIPv6WithZoneId() } @Test - public void shouldSupportIPv6AddressWithBrackets() + void shouldSupportIPv6AddressWithBrackets() { SocketAddress socketAddress = SocketAddressParser.socketAddress( "[fe80:1:2:3:4::5]:123", SocketAddress::new ); @@ -239,7 +216,7 @@ public void shouldSupportIPv6AddressWithBrackets() } @Test - public void shouldSupportIPv6AddressWithoutBrackets() + void shouldSupportIPv6AddressWithoutBrackets() { SocketAddress socketAddress = SocketAddressParser.socketAddress( "fe80:1:2:3:4::5:123", SocketAddress::new ); @@ -250,7 +227,7 @@ public void shouldSupportIPv6AddressWithoutBrackets() } @Test - public void shouldSupportIPv6WildcardWithoutBrackets() + void shouldSupportIPv6WildcardWithoutBrackets() { SocketAddress socketAddress = SocketAddressParser.socketAddress( ":::123", SocketAddress::new ); @@ -260,15 +237,8 @@ public void shouldSupportIPv6WildcardWithoutBrackets() assertTrue( socketAddress.isWildcard() ); } - private String whitespace( int numberOfWhitespaces ) + private static String whitespace( int numberOfWhitespaces ) { - StringBuilder sb = new StringBuilder(); - - for ( int i = 0; i < numberOfWhitespaces; i++ ) - { - sb.append( " " ); - } - - return sb.toString(); + return StringUtils.repeat( " ", numberOfWhitespaces ); } } diff --git a/community/kernel/src/test/java/org/neo4j/helpers/SocketAddressTest.java b/community/kernel/src/test/java/org/neo4j/helpers/SocketAddressTest.java index 98122cb9b361..d928f7d365b3 100644 --- a/community/kernel/src/test/java/org/neo4j/helpers/SocketAddressTest.java +++ b/community/kernel/src/test/java/org/neo4j/helpers/SocketAddressTest.java @@ -19,25 +19,27 @@ */ package org.neo4j.helpers; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class SocketAddressTest +import static org.junit.jupiter.api.Assertions.assertThrows; + +class SocketAddressTest { - @Test( expected = IllegalArgumentException.class ) - public void shouldNotAllowNullAsHostname() + @Test + void shouldNotAllowNullAsHostname() { - new SocketAddress( null, 1 ); + assertThrows( IllegalArgumentException.class, () -> new SocketAddress( null, 1 ) ); } - @Test( expected = IllegalArgumentException.class ) - public void shouldNotAllowStartBracket() + @Test + void shouldNotAllowStartBracket() { - new SocketAddress( "[", 2 ); + assertThrows( IllegalArgumentException.class, () -> new SocketAddress( "[", 2 ) ); } - @Test( expected = IllegalArgumentException.class ) - public void shouldNotAllowEndBracket() + @Test + void shouldNotAllowEndBracket() { - new SocketAddress( "]", 3 ); + assertThrows( IllegalArgumentException.class, () -> new SocketAddress( "]", 3 ) ); } } diff --git a/community/kernel/src/test/java/org/neo4j/helpers/StringsTest.java b/community/kernel/src/test/java/org/neo4j/helpers/StringsTest.java index 7d4e71b7765a..687a78ee95e4 100644 --- a/community/kernel/src/test/java/org/neo4j/helpers/StringsTest.java +++ b/community/kernel/src/test/java/org/neo4j/helpers/StringsTest.java @@ -19,17 +19,17 @@ */ package org.neo4j.helpers; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.net.URI; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.neo4j.helpers.Strings.prettyPrint; -public class StringsTest +class StringsTest { @Test - public void testPrettyPrint() + void testPrettyPrint() { assertEquals( "null", prettyPrint( null ) ); assertEquals( "42", prettyPrint( 42 ) ); @@ -53,7 +53,7 @@ public void testPrettyPrint() } @Test - public void testEscape() + void testEscape() { assertEquals( "abc", Strings.escape( "abc" ) ); assertEquals( "Abc", Strings.escape( "Abc" ) ); @@ -68,7 +68,7 @@ public void testEscape() } @Test - public void testJoiningLines() + void testJoiningLines() { assertEquals( "a" + System.lineSeparator() + "b" + System.lineSeparator() + "c" + System.lineSeparator(), Strings.joinAsLines( "a", "b", "c" ) ); diff --git a/community/kernel/src/test/java/org/neo4j/helpers/TaskCoordinatorTest.java b/community/kernel/src/test/java/org/neo4j/helpers/TaskCoordinatorTest.java index 8b920217b2c0..61915910d47d 100644 --- a/community/kernel/src/test/java/org/neo4j/helpers/TaskCoordinatorTest.java +++ b/community/kernel/src/test/java/org/neo4j/helpers/TaskCoordinatorTest.java @@ -19,7 +19,7 @@ */ package org.neo4j.helpers; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Arrays; @@ -29,14 +29,14 @@ import org.neo4j.test.Barrier; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -public class TaskCoordinatorTest +class TaskCoordinatorTest { @Test - public void shouldCancelAllTasksWithOneCall() + void shouldCancelAllTasksWithOneCall() { // given TaskCoordinator coordinator = new TaskCoordinator( 1, TimeUnit.MILLISECONDS ); @@ -60,7 +60,7 @@ public void shouldCancelAllTasksWithOneCall() } @Test - public void shouldAwaitCompletionOfAllTasks() throws Exception + void shouldAwaitCompletionOfAllTasks() throws Exception { // given final TaskCoordinator coordinator = new TaskCoordinator( 1, TimeUnit.MILLISECONDS ); diff --git a/community/kernel/src/test/java/org/neo4j/helpers/TestArgs.java b/community/kernel/src/test/java/org/neo4j/helpers/TestArgs.java index 975c5309b6a5..2b95605a3ed3 100644 --- a/community/kernel/src/test/java/org/neo4j/helpers/TestArgs.java +++ b/community/kernel/src/test/java/org/neo4j/helpers/TestArgs.java @@ -19,7 +19,7 @@ */ package org.neo4j.helpers; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Arrays; @@ -30,23 +30,25 @@ import java.util.Map; import org.neo4j.helpers.Args.Option; -import org.neo4j.kernel.impl.util.Converters; import org.neo4j.kernel.impl.util.Validator; import static org.hamcrest.CoreMatchers.equalTo; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.neo4j.helpers.collection.MapUtil.stringMap; +import static org.neo4j.kernel.impl.util.Converters.mandatory; +import static org.neo4j.kernel.impl.util.Converters.optional; +import static org.neo4j.kernel.impl.util.Converters.toInt; -public class TestArgs +class TestArgs { @Test - public void testInterleavedParametersWithValuesAndNot() + void testInterleavedParametersWithValuesAndNot() { String[] line = { "-host", "machine.foo.com", "-port", "1234", "-v", "-name", "othershell" }; Args args = Args.parse( line ); @@ -59,7 +61,7 @@ public void testInterleavedParametersWithValuesAndNot() } @Test - public void testInterleavedEqualsArgsAndSplitKeyValue() + void testInterleavedEqualsArgsAndSplitKeyValue() { String[] line = { "-host=localhost", "-v", "--port", "1234", "param1", "-name=Something", "param2" }; Args args = Args.parse( line ); @@ -74,7 +76,7 @@ public void testInterleavedEqualsArgsAndSplitKeyValue() } @Test - public void testParameterWithDashValue() + void testParameterWithDashValue() { String [] line = { "-file", "-" }; Args args = Args.parse( line ); @@ -84,7 +86,7 @@ public void testParameterWithDashValue() } @Test - public void testEnum() + void testEnum() { String[] line = { "--enum=" + MyEnum.second.name() }; Args args = Args.parse( line ); @@ -93,7 +95,7 @@ public void testEnum() } @Test - public void testEnumWithDefault() + void testEnumWithDefault() { String[] line = {}; Args args = Args.parse( line ); @@ -101,16 +103,16 @@ public void testEnumWithDefault() assertEquals( MyEnum.third, result ); } - @Test( expected = IllegalArgumentException.class ) - public void testEnumWithInvalidValue() + @Test + void testEnumWithInvalidValue() { - String[] line = { "--myenum=something" }; + String[] line = {"--myenum=something"}; Args args = Args.parse( line ); - args.getEnum( MyEnum.class, "myenum", MyEnum.third ); + assertThrows( IllegalArgumentException.class, () -> args.getEnum( MyEnum.class, "myenum", MyEnum.third ) ); } @Test - public void shouldInterpretOption() + void shouldInterpretOption() { // GIVEN int expectedValue = 42; @@ -119,7 +121,7 @@ public void shouldInterpretOption() Validator validator = mock( Validator.class ); // WHEN - int value = args.interpretOption( "arg", Converters.mandatory(), Converters.toInt(), validator ); + int value = args.interpretOption( "arg", mandatory(), toInt(), validator ); // THEN assertEquals( expectedValue, value ); @@ -127,7 +129,7 @@ public void shouldInterpretOption() } @Test - public void shouldInterpretOrphan() + void shouldInterpretOrphan() { // GIVEN int expectedValue = 42; @@ -136,7 +138,7 @@ public void shouldInterpretOrphan() Validator validator = mock( Validator.class ); // WHEN - int value = args.interpretOrphan( 0, Converters.mandatory(), Converters.toInt(), validator ); + int value = args.interpretOrphan( 0, mandatory(), toInt(), validator ); // THEN assertEquals( expectedValue, value ); @@ -144,7 +146,7 @@ public void shouldInterpretOrphan() } @Test - public void shouldInterpretMultipleOptionValues() + void shouldInterpretMultipleOptionValues() { // GIVEN Collection expectedValues = Arrays.asList( 12, 34, 56 ); @@ -158,42 +160,33 @@ public void shouldInterpretMultipleOptionValues() Args args = Args.parse( argList.toArray( new String[argList.size()] ) ); // WHEN - try - { - args.get( key ); - fail( "Should have failed" ); - } - catch ( IllegalArgumentException e ) - { // Good - } - - Collection numbers = args.interpretOptions( key, Converters.optional(), - Converters.toInt() ); + assertThrows( IllegalArgumentException.class, () -> args.get( key ) ); + Collection numbers = args.interpretOptions( key, optional(), toInt() ); // THEN assertEquals( expectedValues, numbers ); } @Test - public void testBooleanWithDefault() + void testBooleanWithDefault() { // Given Args args = Args.parse( "--no_value" ); // When & then - assertThat(args.getBoolean( "not_set", true, true ), equalTo(true)); - assertThat(args.getBoolean( "not_set", false, true ), equalTo(false)); - assertThat(args.getBoolean( "not_set", false, false ), equalTo(false)); - assertThat(args.getBoolean( "not_set", true, false ), equalTo(true)); - - assertThat(args.getBoolean( "no_value", true, true ), equalTo(true)); - assertThat(args.getBoolean( "no_value", false, true ), equalTo(true)); - assertThat(args.getBoolean( "no_value", false, false ), equalTo(false)); - assertThat(args.getBoolean( "no_value", true, false ), equalTo(false)); + assertThat( args.getBoolean( "not_set", true, true ), equalTo( true ) ); + assertThat( args.getBoolean( "not_set", false, true ), equalTo( false ) ); + assertThat( args.getBoolean( "not_set", false, false ), equalTo( false ) ); + assertThat( args.getBoolean( "not_set", true, false ), equalTo( true ) ); + + assertThat( args.getBoolean( "no_value", true, true ), equalTo( true ) ); + assertThat( args.getBoolean( "no_value", false, true ), equalTo( true ) ); + assertThat( args.getBoolean( "no_value", false, false ), equalTo( false ) ); + assertThat( args.getBoolean( "no_value", true, false ), equalTo( false ) ); } @Test - public void shouldGetAsMap() + void shouldGetAsMap() { // GIVEN Args args = Args.parse( "--with-value", "value", "--without-value" ); @@ -206,14 +199,14 @@ public void shouldGetAsMap() } @Test - public void shouldInterpretOptionMetadata() + void shouldInterpretOptionMetadata() { // GIVEN Args args = Args.parse( "--my-option:Meta", "my value", "--my-option:Other", "other value" ); // WHEN Collection> options = args.interpretOptionsWithMetadata( "my-option", - Converters.mandatory(), value -> value ); + mandatory(), value -> value ); // THEN assertEquals( 2, options.size() ); @@ -227,7 +220,7 @@ public void shouldInterpretOptionMetadata() } @Test - public void shouldHandleLastOrphanParam() + void shouldHandleLastOrphanParam() { // Given Args args = Args.withFlags("recovery").parse( "--recovery", "/tmp/graph.db" ); @@ -240,7 +233,7 @@ public void shouldHandleLastOrphanParam() } @Test - public void shouldHandleOnlyFlagsAndNoArgs() + void shouldHandleOnlyFlagsAndNoArgs() { // Given Args args = Args.withFlags( "foo", "bar" ).parse("-foo", "--bar"); @@ -255,7 +248,7 @@ public void shouldHandleOnlyFlagsAndNoArgs() } @Test - public void shouldStillAllowExplicitValuesForFlags() + void shouldStillAllowExplicitValuesForFlags() { // Given Args args = Args.withFlags( "foo", "bar" ).parse("-foo=false", "--bar"); @@ -270,7 +263,7 @@ public void shouldStillAllowExplicitValuesForFlags() } @Test - public void shouldHandleMixtureOfFlagsAndOrphanParams() + void shouldHandleMixtureOfFlagsAndOrphanParams() { // Given Args args = Args.withFlags( "big", "soft", "saysMeow" ).parse( @@ -291,7 +284,7 @@ public void shouldHandleMixtureOfFlagsAndOrphanParams() } @Test - public void shouldHandleFlagSpecifiedAsLastArgument() + void shouldHandleFlagSpecifiedAsLastArgument() { // Given Args args = Args.withFlags( "flag1", "flag2" ).parse( @@ -301,15 +294,15 @@ public void shouldHandleFlagSpecifiedAsLastArgument() List orphans = args.orphans(); // Then - assertTrue( "Orphan args expected to be empty, but were: " + orphans, orphans.isEmpty() ); + assertTrue( orphans.isEmpty(), "Orphan args expected to be empty, but were: " + orphans ); assertEquals( "Foo", args.get( "key" ) ); assertEquals( "Bar", args.get( "value" ) ); - assertFalse( "flag1", args.getBoolean( "flag1", true ) ); - assertFalse( "flag1", args.getBoolean( "flag2", true ) ); + assertFalse( args.getBoolean( "flag1", true ) ); + assertFalse( args.getBoolean( "flag2", true ) ); } @Test - public void shouldRecognizeFlagsOfAnyForm() + void shouldRecognizeFlagsOfAnyForm() { // Given Args args = Args.withFlags( "flag1", "flag2", "flag3" ).parse( @@ -319,20 +312,20 @@ public void shouldRecognizeFlagsOfAnyForm() List orphans = args.orphans(); // Then - assertTrue( "Orphan args expected to be empty, but were: " + orphans, orphans.isEmpty() ); + assertTrue( orphans.isEmpty(), "Orphan args expected to be empty, but were: " + orphans ); assertTrue( args.getBoolean( "flag1", false, true ) ); assertTrue( args.getBoolean( "flag2", false, false ) ); assertTrue( args.getBoolean( "flag3", false, false ) ); } @Test - public void shouldReturnEmptyCollectionForOptionalMissingOption() + void shouldReturnEmptyCollectionForOptionalMissingOption() { // Given Args args = Args.withFlags().parse(); // When - Collection interpreted = args.interpretOptions( "something", Converters.optional(), + Collection interpreted = args.interpretOptions( "something", optional(), value -> value ); // Then diff --git a/community/kernel/src/test/java/org/neo4j/helpers/TestExceptions.java b/community/kernel/src/test/java/org/neo4j/helpers/TestExceptions.java index 928717fc3fbb..f4bc591863c7 100644 --- a/community/kernel/src/test/java/org/neo4j/helpers/TestExceptions.java +++ b/community/kernel/src/test/java/org/neo4j/helpers/TestExceptions.java @@ -19,18 +19,18 @@ */ package org.neo4j.helpers; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.neo4j.function.Predicates; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -public class TestExceptions +class TestExceptions { @Test - public void canPeelExceptions() + void canPeelExceptions() { // given Throwable expected; @@ -50,7 +50,7 @@ public void canPeelExceptions() } @Test - public void canPeelUsingConveniencePredicate() + void canPeelUsingConveniencePredicate() { // given Throwable expected; @@ -70,7 +70,7 @@ public void canPeelUsingConveniencePredicate() } @Test - public void shouldDetectContainsOneOfSome() + void shouldDetectContainsOneOfSome() { // GIVEN Throwable cause = new ARuntimeException( new AnotherRuntimeException( new NullPointerException( "Some words" ) ) ); @@ -82,7 +82,7 @@ public void shouldDetectContainsOneOfSome() } @Test - public void shouldSetMessage() + void shouldSetMessage() { // GIVEN String initialMessage = "Initial message"; diff --git a/community/kernel/src/test/java/org/neo4j/helpers/TestFormat.java b/community/kernel/src/test/java/org/neo4j/helpers/TestFormat.java index 5261c2753302..a65c9c3d4f7d 100644 --- a/community/kernel/src/test/java/org/neo4j/helpers/TestFormat.java +++ b/community/kernel/src/test/java/org/neo4j/helpers/TestFormat.java @@ -19,20 +19,20 @@ */ package org.neo4j.helpers; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; import java.util.TimeZone; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; -public class TestFormat +class TestFormat { @Test - public void dateTime() throws Exception + void dateTime() throws Exception { // Date long timeWithDate = System.currentTimeMillis(); @@ -46,7 +46,7 @@ public void dateTime() throws Exception } @Test - public void dateTimeWithTimeZone() throws Exception + void dateTimeWithTimeZone() throws Exception { String zoneOffset = "+03:00"; TimeZone zone = TimeZone.getTimeZone( "GMT" + zoneOffset ); @@ -74,7 +74,7 @@ public void dateTimeWithTimeZone() throws Exception new SimpleDateFormat( Format.TIME_FORMAT ).parse( asString ).getTime(), zone ) ); } - private long translateToDate( long timeWithDate, long time, TimeZone timeIsGivenInThisTimeZone ) + private static long translateToDate( long timeWithDate, long time, TimeZone timeIsGivenInThisTimeZone ) { Calendar calendar = Calendar.getInstance(timeIsGivenInThisTimeZone); calendar.setTimeInMillis( timeWithDate ); @@ -90,7 +90,7 @@ private long translateToDate( long timeWithDate, long time, TimeZone timeIsGiven return timeCalendar.getTimeInMillis(); } - private String withoutColon( String zoneOffset ) + private static String withoutColon( String zoneOffset ) { return zoneOffset.replaceAll( ":", "" ); } diff --git a/community/kernel/src/test/java/org/neo4j/helpers/TimeUtilTest.java b/community/kernel/src/test/java/org/neo4j/helpers/TimeUtilTest.java index 82611e293e02..8384117fc3d5 100644 --- a/community/kernel/src/test/java/org/neo4j/helpers/TimeUtilTest.java +++ b/community/kernel/src/test/java/org/neo4j/helpers/TimeUtilTest.java @@ -19,15 +19,15 @@ */ package org.neo4j.helpers; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.neo4j.helpers.TimeUtil.nanosToString; -public class TimeUtilTest +class TimeUtilTest { @Test - public void formatNanosToString() + void formatNanosToString() { assertEquals( "1ns", nanosToString( 1 ) ); assertEquals( "10ns", nanosToString( 10 ) ); diff --git a/community/kernel/src/test/java/org/neo4j/helpers/UrisTest.java b/community/kernel/src/test/java/org/neo4j/helpers/UrisTest.java index 0bb4b9cc11a0..eee628d65dd2 100644 --- a/community/kernel/src/test/java/org/neo4j/helpers/UrisTest.java +++ b/community/kernel/src/test/java/org/neo4j/helpers/UrisTest.java @@ -19,19 +19,19 @@ */ package org.neo4j.helpers; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.net.URI; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.nullValue; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.neo4j.helpers.Uris.parameter; -public class UrisTest +class UrisTest { @Test - public void testParam() + void testParam() { URI uri = URI.create("http://localhost/foo?x=a&y=b&z"); diff --git a/community/kernel/src/test/java/org/neo4j/helpers/ValueUtilsTest.java b/community/kernel/src/test/java/org/neo4j/helpers/ValueUtilsTest.java index 0f52ef5d5c4d..63b24dbb59a4 100644 --- a/community/kernel/src/test/java/org/neo4j/helpers/ValueUtilsTest.java +++ b/community/kernel/src/test/java/org/neo4j/helpers/ValueUtilsTest.java @@ -19,7 +19,7 @@ */ package org.neo4j.helpers; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.Collection; @@ -39,16 +39,15 @@ import static org.neo4j.values.storable.Values.intValue; import static org.neo4j.values.storable.Values.stringValue; -public class ValueUtilsTest +class ValueUtilsTest { @Test - public void shouldHandleCollection() + void shouldHandleCollection() { // Given Collection collection = Arrays.asList( 1, 2, 3 ); // When - AnyValue of = ValueUtils.of( collection ); // Then @@ -61,7 +60,7 @@ public void shouldHandleCollection() } @Test - public void shouldHandleIterator() + void shouldHandleIterator() { // Given Iterator iterator = Arrays.asList( 1, 2, 3 ).iterator(); @@ -79,7 +78,7 @@ public void shouldHandleIterator() } @Test - public void shouldHandleMaps() + void shouldHandleMaps() { // Given Map map = MapUtil.map( "a", Arrays.asList( "foo", 42 ) ); @@ -95,13 +94,12 @@ public void shouldHandleMaps() } @Test - public void shouldHandleIterable() + void shouldHandleIterable() { // Given Iterable collection = Arrays.asList( 1, 2, 3 ); // When - AnyValue of = ValueUtils.of( collection ); // Then diff --git a/community/kernel/src/test/java/org/neo4j/metatest/BatchTransactionTest.java b/community/kernel/src/test/java/org/neo4j/metatest/BatchTransactionTest.java index 6ad1dc041523..495e55298202 100644 --- a/community/kernel/src/test/java/org/neo4j/metatest/BatchTransactionTest.java +++ b/community/kernel/src/test/java/org/neo4j/metatest/BatchTransactionTest.java @@ -19,7 +19,7 @@ */ package org.neo4j.metatest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Transaction; @@ -32,10 +32,10 @@ import static org.mockito.Mockito.when; import static org.neo4j.test.BatchTransaction.beginBatchTx; -public class BatchTransactionTest +class BatchTransactionTest { @Test - public void shouldUseProgressListener() + void shouldUseProgressListener() { // GIVEN Transaction transaction = mock( Transaction.class ); diff --git a/community/kernel/src/test/java/org/neo4j/metatest/SubProcessTest.java b/community/kernel/src/test/java/org/neo4j/metatest/SubProcessTest.java index 5f385d006862..a04f011c800b 100644 --- a/community/kernel/src/test/java/org/neo4j/metatest/SubProcessTest.java +++ b/community/kernel/src/test/java/org/neo4j/metatest/SubProcessTest.java @@ -19,18 +19,32 @@ */ package org.neo4j.metatest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.concurrent.Callable; import org.neo4j.test.subprocess.SubProcess; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -public class SubProcessTest +class SubProcessTest { private static final String MESSAGE = "message"; + @Test + void canInvokeSubprocessMethod() throws Exception + { + Callable subprocess = new TestingProcess().start( MESSAGE ); + try + { + assertEquals( MESSAGE, subprocess.call() ); + } + finally + { + SubProcess.stop( subprocess ); + } + } + @SuppressWarnings( "serial" ) private static class TestingProcess extends SubProcess, String> implements Callable { @@ -55,18 +69,4 @@ public String call() throws Exception return message; } } - - @Test - public void canInvokeSubprocessMethod() throws Exception - { - Callable subprocess = new TestingProcess().start( MESSAGE ); - try - { - assertEquals( MESSAGE, subprocess.call() ); - } - finally - { - SubProcess.stop( subprocess ); - } - } } diff --git a/community/kernel/src/test/java/org/neo4j/metatest/TestEphemeralFileChannel.java b/community/kernel/src/test/java/org/neo4j/metatest/TestEphemeralFileChannel.java index 749982b2a77f..27684af03f10 100644 --- a/community/kernel/src/test/java/org/neo4j/metatest/TestEphemeralFileChannel.java +++ b/community/kernel/src/test/java/org/neo4j/metatest/TestEphemeralFileChannel.java @@ -19,8 +19,8 @@ */ package org.neo4j.metatest; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import java.io.File; import java.nio.ByteBuffer; @@ -29,31 +29,32 @@ import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction; import org.neo4j.io.fs.OpenMode; import org.neo4j.io.fs.StoreChannel; -import org.neo4j.test.rule.fs.EphemeralFileSystemRule; +import org.neo4j.test.extension.EphemeralFileSystemExtension; +import org.neo4j.test.extension.Inject; import static java.nio.ByteBuffer.allocate; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.neo4j.helpers.collection.Iterators.asSet; -public class TestEphemeralFileChannel +@ExtendWith( EphemeralFileSystemExtension.class ) +class TestEphemeralFileChannel { - @Rule - public final EphemeralFileSystemRule fileSystemRule = new EphemeralFileSystemRule(); + @Inject + private EphemeralFileSystemAbstraction fileSystem; @Test - public void smoke() throws Exception + void smoke() throws Exception { - EphemeralFileSystemAbstraction fs = fileSystemRule.get(); - StoreChannel channel = fs.open( new File( "yo" ), OpenMode.READ_WRITE ); + StoreChannel channel = fileSystem.open( new File( "yo" ), OpenMode.READ_WRITE ); // Clear it because we depend on it to be zeros where we haven't written ByteBuffer buffer = allocate( 23 ); buffer.put( new byte[23] ); // zeros buffer.flip(); channel.write( buffer ); - channel = fs.open( new File( "yo" ), OpenMode.READ_WRITE ); + channel = fileSystem.open( new File( "yo" ), OpenMode.READ_WRITE ); long longValue = 1234567890L; // [1].....[2]........[1234567890L]... @@ -102,32 +103,29 @@ public void smoke() throws Exception channel.read( buffer, 15 ); buffer.flip(); assertEquals( longValue, buffer.getLong() ); - fs.close(); } @Test - public void absoluteVersusRelative() throws Exception + void absoluteVersusRelative() throws Exception { // GIVEN File file = new File( "myfile" ); - EphemeralFileSystemAbstraction fs = fileSystemRule.get(); - StoreChannel channel = fs.open( file, OpenMode.READ_WRITE ); + StoreChannel channel = fileSystem.open( file, OpenMode.READ_WRITE ); byte[] bytes = "test".getBytes(); channel.write( ByteBuffer.wrap( bytes ) ); channel.close(); // WHEN - channel = fs.open( new File( file.getAbsolutePath() ), OpenMode.READ ); + channel = fileSystem.open( new File( file.getAbsolutePath() ), OpenMode.READ ); byte[] readBytes = new byte[bytes.length]; channel.readAll( ByteBuffer.wrap( readBytes ) ); // THEN assertTrue( Arrays.equals( bytes, readBytes ) ); - fs.close(); } @Test - public void listFiles() throws Exception + void listFiles() throws Exception { /* GIVEN * root @@ -138,7 +136,6 @@ public void listFiles() throws Exception * | * file */ - EphemeralFileSystemAbstraction fs = fileSystemRule.get(); File root = new File( "/root" ).getCanonicalFile(); File dir1 = new File( root, "dir1" ); File dir2 = new File( root, "dir2" ); @@ -148,20 +145,19 @@ public void listFiles() throws Exception File file3 = new File( dir2, "file" ); File file4 = new File( subdir1, "file" ); - fs.mkdirs( dir2 ); - fs.mkdirs( dir1 ); - fs.mkdirs( subdir1 ); + fileSystem.mkdirs( dir2 ); + fileSystem.mkdirs( dir1 ); + fileSystem.mkdirs( subdir1 ); - fs.create( file1 ); - fs.create( file2 ); - fs.create( file3 ); - fs.create( file4 ); + fileSystem.create( file1 ); + fileSystem.create( file2 ); + fileSystem.create( file3 ); + fileSystem.create( file4 ); // THEN - assertEquals( asSet( dir1, dir2 ), asSet( fs.listFiles( root ) ) ); - assertEquals( asSet( subdir1, file1, file2 ), asSet( fs.listFiles( dir1 ) ) ); - assertEquals( asSet( file3 ), asSet( fs.listFiles( dir2 ) ) ); - assertEquals( asSet( file4 ), asSet( fs.listFiles( subdir1 ) ) ); - fs.close(); + assertEquals( asSet( dir1, dir2 ), asSet( fileSystem.listFiles( root ) ) ); + assertEquals( asSet( subdir1, file1, file2 ), asSet( fileSystem.listFiles( dir1 ) ) ); + assertEquals( asSet( file3 ), asSet( fileSystem.listFiles( dir2 ) ) ); + assertEquals( asSet( file4 ), asSet( fileSystem.listFiles( subdir1 ) ) ); } } diff --git a/community/kernel/src/test/java/org/neo4j/storageengine/api/schema/DefaultIndexReaderTest.java b/community/kernel/src/test/java/org/neo4j/storageengine/api/schema/DefaultIndexReaderTest.java index 8fc4dda97337..2ece88cfaf09 100644 --- a/community/kernel/src/test/java/org/neo4j/storageengine/api/schema/DefaultIndexReaderTest.java +++ b/community/kernel/src/test/java/org/neo4j/storageengine/api/schema/DefaultIndexReaderTest.java @@ -19,36 +19,33 @@ */ package org.neo4j.storageengine.api.schema; -import org.hamcrest.Matchers; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; +import org.junit.jupiter.api.Test; import org.neo4j.collection.PrimitiveLongResourceIterator; import org.neo4j.internal.kernel.api.IndexOrder; import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.values.storable.Value; -public class DefaultIndexReaderTest -{ - @Rule - public ExpectedException expectedException = ExpectedException.none(); +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +class DefaultIndexReaderTest +{ @Test - public void defaultQueryImplementationMustThrowForUnsupportedIndexOrder() throws Exception + void defaultQueryImplementationMustThrowForUnsupportedIndexOrder() { // Given IndexReader indexReader = stubIndexReader(); // Then - expectedException.expect( UnsupportedOperationException.class ); String expectedMessage = String.format( "This reader only have support for index order %s. Provided index order was %s.", IndexOrder.NONE, IndexOrder.ASCENDING ); - expectedException.expectMessage( Matchers.containsString( expectedMessage ) ); - indexReader.query( new SimpleNodeValueClient(), IndexOrder.ASCENDING, IndexQuery.exists( 1 ) ); + UnsupportedOperationException operationException = assertThrows( UnsupportedOperationException.class, + () -> indexReader.query( new SimpleNodeValueClient(), IndexOrder.ASCENDING, IndexQuery.exists( 1 ) ) ); + assertEquals( expectedMessage, operationException.getMessage() ); } - private IndexReader stubIndexReader() + private static IndexReader stubIndexReader() { return new AbstractIndexReader( null ) { diff --git a/community/kernel/src/test/java/org/neo4j/sysinfo/UsageDataTest.java b/community/kernel/src/test/java/org/neo4j/sysinfo/UsageDataTest.java index 5c1416b55de1..c779ad26cfee 100644 --- a/community/kernel/src/test/java/org/neo4j/sysinfo/UsageDataTest.java +++ b/community/kernel/src/test/java/org/neo4j/sysinfo/UsageDataTest.java @@ -19,20 +19,21 @@ */ package org.neo4j.sysinfo; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.neo4j.scheduler.JobScheduler; import org.neo4j.udc.UsageData; import org.neo4j.udc.UsageDataKey; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.mockito.Mockito.mock; import static org.neo4j.udc.UsageDataKey.key; -public class UsageDataTest +class UsageDataTest { @Test - public void shouldPutAndRetrieve() + void shouldPutAndRetrieve() { // Given UsageData ms = new UsageData( mock( JobScheduler.class ) ); @@ -43,6 +44,6 @@ public void shouldPutAndRetrieve() // Then assertEquals( "Hello!", ms.get( key ) ); - assertEquals( null, ms.get( key( "other" ) ) ); + assertNull( ms.get( key( "other" ) ) ); } } diff --git a/community/kernel/src/test/java/org/neo4j/test/InputStreamAwaiterTest.java b/community/kernel/src/test/java/org/neo4j/test/InputStreamAwaiterTest.java index fa7a2c9fa73d..7f16e24acb17 100644 --- a/community/kernel/src/test/java/org/neo4j/test/InputStreamAwaiterTest.java +++ b/community/kernel/src/test/java/org/neo4j/test/InputStreamAwaiterTest.java @@ -19,9 +19,8 @@ */ package org.neo4j.test; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import java.io.IOException; import java.io.InputStream; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; @@ -29,13 +28,13 @@ import org.neo4j.time.Clocks; import org.neo4j.time.FakeClock; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.spy; -public class InputStreamAwaiterTest +class InputStreamAwaiterTest { @Test - public void shouldWaitForALineWithoutBlocking() throws Exception + void shouldWaitForALineWithoutBlocking() throws Exception { // given FakeClock clock = getFakeClock(); @@ -48,7 +47,7 @@ public void shouldWaitForALineWithoutBlocking() throws Exception } @Test - public void shouldTimeoutWhenDifferentContentProvided() throws Exception + void shouldTimeoutWhenDifferentContentProvided() { // given FakeClock clock = getFakeClock(); @@ -58,20 +57,11 @@ public void shouldTimeoutWhenDifferentContentProvided() throws Exception InputStreamAwaiter awaiter = new InputStreamAwaiter( clock, inputStream ); // when - try - { - awaiter.awaitLine( "important message", 5, TimeUnit.SECONDS ); - fail( "should have thrown exception" ); - } - // then - catch ( TimeoutException e ) - { - // ok - } + assertThrows( TimeoutException.class, () -> awaiter.awaitLine( "important message", 5, TimeUnit.SECONDS ) ); } @Test - public void shouldTimeoutWhenNoContentProvided() throws Exception + void shouldTimeoutWhenNoContentProvided() throws Exception { // given FakeClock clock = getFakeClock(); @@ -79,16 +69,7 @@ public void shouldTimeoutWhenNoContentProvided() throws Exception InputStreamAwaiter awaiter = new InputStreamAwaiter( clock, inputStream ); // when - try - { - awaiter.awaitLine( "important message", 5, TimeUnit.SECONDS ); - fail( "should have thrown exception" ); - } - // then - catch ( TimeoutException e ) - { - // ok - } + assertThrows( TimeoutException.class, () -> awaiter.awaitLine( "important message", 5, TimeUnit.SECONDS ) ); } private static String lines( String... lines ) @@ -101,16 +82,16 @@ private static String lines( String... lines ) return result.toString(); } - private FakeClock getFakeClock() + private static FakeClock getFakeClock() { return Clocks.fakeClock(); } - private class Ticker + private static class Ticker { - private FakeClock clock; - private long duration; - private TimeUnit timeUnit; + private final FakeClock clock; + private final long duration; + private final TimeUnit timeUnit; Ticker( FakeClock clock, long duration, TimeUnit timeUnit ) { diff --git a/community/kernel/src/test/java/org/neo4j/test/RaceTest.java b/community/kernel/src/test/java/org/neo4j/test/RaceTest.java index be32328a27eb..6b747ca661a7 100644 --- a/community/kernel/src/test/java/org/neo4j/test/RaceTest.java +++ b/community/kernel/src/test/java/org/neo4j/test/RaceTest.java @@ -19,7 +19,7 @@ */ package org.neo4j.test; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.BooleanSupplier; @@ -28,9 +28,9 @@ import static java.lang.Thread.sleep; import static java.util.concurrent.ThreadLocalRandom.current; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.atLeast; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -39,10 +39,10 @@ /** * Test of a test utility {@link Race}. */ -public class RaceTest +class RaceTest { @Test - public void shouldWaitForAllContestantsToComplete() throws Throwable + void shouldWaitForAllContestantsToComplete() throws Throwable { // GIVEN Race race = new Race(); @@ -62,7 +62,7 @@ public void shouldWaitForAllContestantsToComplete() throws Throwable } @Test - public void shouldConsultEndCondition() throws Throwable + void shouldConsultEndCondition() throws Throwable { // GIVEN CallCountBooleanSupplier endCondition = new CallCountBooleanSupplier( 100 ); @@ -77,7 +77,7 @@ public void shouldConsultEndCondition() throws Throwable } @Test - public void shouldHaveMultipleEndConditions() throws Throwable + void shouldHaveMultipleEndConditions() throws Throwable { // GIVEN ControlledBooleanSupplier endCondition1 = spy( new ControlledBooleanSupplier( false ) ); @@ -96,7 +96,7 @@ public void shouldHaveMultipleEndConditions() throws Throwable } @Test - public void shouldBreakOnError() throws Throwable + void shouldBreakOnError() throws Throwable { // GIVEN String error = "Noooo"; @@ -106,28 +106,18 @@ public void shouldBreakOnError() throws Throwable { throw new RuntimeException( error ); } ); - race.addContestants( 3, () -> - { - } ); + race.addContestants( 3, () -> { } ); // WHEN - try - { - race.go(); - fail( "Should've failed "); - } - catch ( Exception e ) - { - // THEN - assertEquals( error, e.getMessage() ); - } + Exception exception = assertThrows( Exception.class, race::go ); + assertEquals( error, exception.getMessage() ); } public static class ControlledBooleanSupplier implements BooleanSupplier { private volatile boolean value; - public ControlledBooleanSupplier( boolean initialValue ) + ControlledBooleanSupplier( boolean initialValue ) { this.value = initialValue; } @@ -149,7 +139,7 @@ public static class CallCountBooleanSupplier implements BooleanSupplier private final int callCountTriggeringTrueEndCondition; private final AtomicInteger callCount = new AtomicInteger(); - public CallCountBooleanSupplier( int callCountTriggeringTrueEndCondition ) + CallCountBooleanSupplier( int callCountTriggeringTrueEndCondition ) { this.callCountTriggeringTrueEndCondition = callCountTriggeringTrueEndCondition; } diff --git a/community/kernel/src/test/java/org/neo4j/test/StreamConsumer.java b/community/kernel/src/test/java/org/neo4j/test/StreamConsumer.java index 5a7d517e14ae..377609b00154 100644 --- a/community/kernel/src/test/java/org/neo4j/test/StreamConsumer.java +++ b/community/kernel/src/test/java/org/neo4j/test/StreamConsumer.java @@ -38,9 +38,9 @@ public interface StreamExceptionHandler void handle( IOException failure ); } - public static StreamExceptionHandler PRINT_FAILURES = Throwable::printStackTrace; + public static final StreamExceptionHandler PRINT_FAILURES = Throwable::printStackTrace; - public static StreamExceptionHandler IGNORE_FAILURES = failure -> + public static final StreamExceptionHandler IGNORE_FAILURES = failure -> { }; diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/SpatialMocks.java b/community/kernel/src/test/java/org/neo4j/test/mockito/mock/SpatialMocks.java similarity index 99% rename from community/kernel/src/test/java/org/neo4j/graphdb/SpatialMocks.java rename to community/kernel/src/test/java/org/neo4j/test/mockito/mock/SpatialMocks.java index 5604d83f1fa8..dfed12c11968 100644 --- a/community/kernel/src/test/java/org/neo4j/graphdb/SpatialMocks.java +++ b/community/kernel/src/test/java/org/neo4j/test/mockito/mock/SpatialMocks.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.mock; import java.util.ArrayList; import java.util.List; diff --git a/community/kernel/src/test/java/org/neo4j/test/rule/CleanupRule.java b/community/kernel/src/test/java/org/neo4j/test/rule/CleanupRule.java index d2793de10296..fdd9026b6ebb 100644 --- a/community/kernel/src/test/java/org/neo4j/test/rule/CleanupRule.java +++ b/community/kernel/src/test/java/org/neo4j/test/rule/CleanupRule.java @@ -87,19 +87,17 @@ public T add( T toClose ) } catch ( NoSuchMethodException e ) { - // Try the next method - continue; + // ignore } catch ( SecurityException e ) { throw new RuntimeException( e ); } } - throw new IllegalArgumentException( "No suitable close method found on " + toClose + - ", which is a " + cls ); + throw new IllegalArgumentException( "No suitable close method found on " + toClose + ", which is a " + cls ); } - private AutoCloseable closeable( final Method method, final Object target ) + private static AutoCloseable closeable( final Method method, final Object target ) { return () -> { 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 b371a604c3ba..1908cbf8be42 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 @@ -57,7 +57,6 @@ import org.neo4j.graphdb.QueryExecutionType; import org.neo4j.graphdb.Relationship; import org.neo4j.graphdb.Result; -import org.neo4j.graphdb.SpatialMocks; import org.neo4j.graphdb.impl.notification.NotificationCode; import org.neo4j.graphdb.spatial.Coordinate; import org.neo4j.helpers.collection.MapUtil; @@ -69,6 +68,7 @@ import org.neo4j.server.rest.transactional.error.Neo4jError; import org.neo4j.test.mockito.mock.GraphMock; import org.neo4j.test.mockito.mock.Link; +import org.neo4j.test.mockito.mock.SpatialMocks; import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.Arrays.asList; @@ -83,10 +83,6 @@ import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.neo4j.graphdb.SpatialMocks.mockCartesian; -import static org.neo4j.graphdb.SpatialMocks.mockCartesian_3D; -import static org.neo4j.graphdb.SpatialMocks.mockWGS84; -import static org.neo4j.graphdb.SpatialMocks.mockWGS84_3D; import static org.neo4j.helpers.collection.Iterators.asSet; import static org.neo4j.helpers.collection.MapUtil.map; import static org.neo4j.server.rest.domain.JsonHelper.jsonNode; @@ -97,6 +93,10 @@ 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; +import static org.neo4j.test.mockito.mock.SpatialMocks.mockCartesian; +import static org.neo4j.test.mockito.mock.SpatialMocks.mockCartesian_3D; +import static org.neo4j.test.mockito.mock.SpatialMocks.mockWGS84; +import static org.neo4j.test.mockito.mock.SpatialMocks.mockWGS84_3D; public class ExecutionResultSerializerTest extends TxStateCheckerTestSupport { diff --git a/community/server/src/test/java/org/neo4j/server/rest/transactional/Neo4jJsonCodecTest.java b/community/server/src/test/java/org/neo4j/server/rest/transactional/Neo4jJsonCodecTest.java index c9c740888740..74f4b8d21f6b 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/transactional/Neo4jJsonCodecTest.java +++ b/community/server/src/test/java/org/neo4j/server/rest/transactional/Neo4jJsonCodecTest.java @@ -36,11 +36,11 @@ import org.neo4j.graphdb.Path; import org.neo4j.graphdb.PropertyContainer; import org.neo4j.graphdb.Relationship; -import org.neo4j.graphdb.SpatialMocks; import org.neo4j.graphdb.spatial.CRS; import org.neo4j.graphdb.spatial.Coordinate; import org.neo4j.graphdb.spatial.Geometry; import org.neo4j.graphdb.spatial.Point; +import org.neo4j.test.mockito.mock.SpatialMocks; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.anyInt; @@ -52,10 +52,10 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static org.neo4j.graphdb.SpatialMocks.mockCartesian; -import static org.neo4j.graphdb.SpatialMocks.mockCartesian_3D; -import static org.neo4j.graphdb.SpatialMocks.mockWGS84; -import static org.neo4j.graphdb.SpatialMocks.mockWGS84_3D; +import static org.neo4j.test.mockito.mock.SpatialMocks.mockCartesian; +import static org.neo4j.test.mockito.mock.SpatialMocks.mockCartesian_3D; +import static org.neo4j.test.mockito.mock.SpatialMocks.mockWGS84; +import static org.neo4j.test.mockito.mock.SpatialMocks.mockWGS84_3D; public class Neo4jJsonCodecTest extends TxStateCheckerTestSupport {