diff --git a/bundle/pom.xml b/bundle/pom.xml index 4e07d34047..43c51f4744 100644 --- a/bundle/pom.xml +++ b/bundle/pom.xml @@ -55,6 +55,29 @@ + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-javadocs + + jar + + + + + + + + + + + + + @@ -74,7 +97,12 @@ ${rootDir}/driver/src/main/java - **\/*.java + + **\/*.java + + + module-info.java + diff --git a/driver/clirr-ignored-differences.xml b/driver/clirr-ignored-differences.xml index 9bd4cb886c..34e1f9fe6d 100644 --- a/driver/clirr-ignored-differences.xml +++ b/driver/clirr-ignored-differences.xml @@ -340,4 +340,29 @@ void close() + + org/neo4j/driver/AuthTokens + 7009 + AuthTokens() + + + + org/neo4j/driver/GraphDatabase + 7009 + GraphDatabase() + + + + org/neo4j/driver/Records + 7009 + Records() + + + + org/neo4j/driver/Values + 7006 + org.neo4j.driver.internal.value.BytesValue value(byte[]) + org.neo4j.driver.Value + + diff --git a/driver/pom.xml b/driver/pom.xml index 91115c967b..62f35c09eb 100644 --- a/driver/pom.xml +++ b/driver/pom.xml @@ -16,8 +16,10 @@ Access to the Neo4j graph database through Java - org.neo4j.driver ${project.basedir}/.. + ${basedir}/target/classes-without-jpms + --add-opens org.neo4j.driver/org.neo4j.driver.internal.util.messaging=ALL-UNNAMED + --add-opens org.neo4j.driver/org.neo4j.driver.internal.util=ALL-UNNAMED --add-opens org.neo4j.driver/org.neo4j.driver.internal.async=ALL-UNNAMED false @@ -111,21 +113,80 @@ + + + + org.apache.maven.plugins + maven-compiler-plugin + + + --add-exports + jdk.internal.vm.ci/jdk.vm.ci.code=org.graalvm.nativeimage.builder + --add-exports + org.graalvm.nativeimage.builder/com.oracle.svm.core.annotate=org.neo4j.driver + --add-exports + org.graalvm.nativeimage.builder/com.oracle.svm.core.jdk=org.neo4j.driver + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + + + + + + + + org.apache.maven.plugins + maven-resources-plugin + 3.3.0 + + + copy-classes-excluding-jpms + compile + + copy-resources + + + ${api.classes.directory} + + + ${project.build.outputDirectory} + + module-info.class + + + + + + + + + org.codehaus.mojo + clirr-maven-plugin + + + + org.neo4j.driver + neo4j-java-driver + 4.0.0 + + + ${api.classes.directory} + org/neo4j/driver/internal/** + clirr-ignored-differences.xml + + + + org.codehaus.mojo clirr-maven-plugin - - - - org.neo4j.driver - neo4j-java-driver - 4.0.0 - - - org/neo4j/driver/internal/** - clirr-ignored-differences.xml - org.apache.maven.plugins @@ -155,8 +216,6 @@ ${project.version}-${build.revision} - - ${moduleName} diff --git a/driver/src/main/java/module-info.java b/driver/src/main/java/module-info.java new file mode 100644 index 0000000000..368891ed49 --- /dev/null +++ b/driver/src/main/java/module-info.java @@ -0,0 +1,42 @@ +/* + * Copyright (c) "Neo4j" + * Neo4j Sweden AB [http://neo4j.com] + * + * This file is part of Neo4j. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +@SuppressWarnings({"requires-automatic", "requires-transitive-automatic"}) +module org.neo4j.driver { + exports org.neo4j.driver; + exports org.neo4j.driver.async; + exports org.neo4j.driver.reactive; + exports org.neo4j.driver.types; + exports org.neo4j.driver.summary; + exports org.neo4j.driver.net; + exports org.neo4j.driver.util; + exports org.neo4j.driver.exceptions; + + requires reactor.core; + requires io.netty.common; + requires io.netty.handler; + requires io.netty.transport; + requires io.netty.buffer; + requires io.netty.codec; + requires io.netty.resolver; + requires transitive java.logging; + requires transitive org.reactivestreams; + requires static micrometer.core; + requires static org.graalvm.nativeimage.builder; + requires static org.slf4j; +} diff --git a/driver/src/main/java/org/neo4j/driver/AuthTokens.java b/driver/src/main/java/org/neo4j/driver/AuthTokens.java index 66cb0f5841..dd235ecdbb 100644 --- a/driver/src/main/java/org/neo4j/driver/AuthTokens.java +++ b/driver/src/main/java/org/neo4j/driver/AuthTokens.java @@ -39,6 +39,8 @@ * @since 1.0 */ public class AuthTokens { + private AuthTokens() {} + /** * The basic authentication scheme, using a username and a password. * @param username this is the "principal", identifying who this token represents diff --git a/driver/src/main/java/org/neo4j/driver/Config.java b/driver/src/main/java/org/neo4j/driver/Config.java index 4cc5eab80e..e0302496ac 100644 --- a/driver/src/main/java/org/neo4j/driver/Config.java +++ b/driver/src/main/java/org/neo4j/driver/Config.java @@ -32,7 +32,6 @@ import java.util.Objects; import java.util.concurrent.TimeUnit; import java.util.logging.Level; -import org.neo4j.driver.internal.RevocationStrategy; import org.neo4j.driver.internal.SecuritySettings; import org.neo4j.driver.internal.async.pool.PoolSettings; import org.neo4j.driver.internal.cluster.RoutingSettings; @@ -710,6 +709,7 @@ public Config build() { * Control how the driver determines if it can trust the encryption certificates provided by the Neo4j instance it is connected to. */ public static class TrustStrategy implements Serializable { + @Serial private static final long serialVersionUID = -1631888096243987740L; /** diff --git a/driver/src/main/java/org/neo4j/driver/GraphDatabase.java b/driver/src/main/java/org/neo4j/driver/GraphDatabase.java index 5d18b6f744..c77c6d8327 100644 --- a/driver/src/main/java/org/neo4j/driver/GraphDatabase.java +++ b/driver/src/main/java/org/neo4j/driver/GraphDatabase.java @@ -34,6 +34,8 @@ * @since 1.0 */ public class GraphDatabase { + private GraphDatabase() {} + /** * Return a driver for a Neo4j instance with the default configuration settings * diff --git a/driver/src/main/java/org/neo4j/driver/Records.java b/driver/src/main/java/org/neo4j/driver/Records.java index 583429f363..8e5ac11dce 100644 --- a/driver/src/main/java/org/neo4j/driver/Records.java +++ b/driver/src/main/java/org/neo4j/driver/Records.java @@ -27,6 +27,8 @@ * @since 1.0 */ public abstract class Records { + private Records() {} + public static Function column(int index) { return column(index, Values.ofValue()); } diff --git a/driver/src/main/java/org/neo4j/driver/internal/RevocationStrategy.java b/driver/src/main/java/org/neo4j/driver/RevocationStrategy.java similarity index 97% rename from driver/src/main/java/org/neo4j/driver/internal/RevocationStrategy.java rename to driver/src/main/java/org/neo4j/driver/RevocationStrategy.java index d98204a853..e5a6c4fc24 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/RevocationStrategy.java +++ b/driver/src/main/java/org/neo4j/driver/RevocationStrategy.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal; +package org.neo4j.driver; public enum RevocationStrategy { /** Don't do any OCSP revocation checks, regardless whether there are stapled revocation statuses or not. */ diff --git a/driver/src/main/java/org/neo4j/driver/Values.java b/driver/src/main/java/org/neo4j/driver/Values.java index 6b39c245eb..62eb228e10 100644 --- a/driver/src/main/java/org/neo4j/driver/Values.java +++ b/driver/src/main/java/org/neo4j/driver/Values.java @@ -221,7 +221,7 @@ public static Value value(Value... input) { return new ListValue(values); } - public static BytesValue value(byte... input) { + public static Value value(byte... input) { return new BytesValue(input); } diff --git a/driver/src/main/java/org/neo4j/driver/internal/SecuritySettings.java b/driver/src/main/java/org/neo4j/driver/internal/SecuritySettings.java index 27e68d2ae0..6c55e17be7 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/SecuritySettings.java +++ b/driver/src/main/java/org/neo4j/driver/internal/SecuritySettings.java @@ -26,6 +26,7 @@ import java.io.Serializable; import java.security.GeneralSecurityException; import org.neo4j.driver.Config; +import org.neo4j.driver.RevocationStrategy; import org.neo4j.driver.exceptions.ClientException; import org.neo4j.driver.internal.security.SecurityPlan; import org.neo4j.driver.internal.security.SecurityPlanImpl; diff --git a/driver/src/main/java/org/neo4j/driver/internal/packstream/PackStream.java b/driver/src/main/java/org/neo4j/driver/internal/packstream/PackStream.java index 5af4f15490..a38386bebd 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/packstream/PackStream.java +++ b/driver/src/main/java/org/neo4j/driver/internal/packstream/PackStream.java @@ -36,8 +36,9 @@ * Extra markers should not be added casually and such additions must be follow a strict process involving both client and server software. * * The table below shows all allocated marker byte values. - * + *

* + * * * * diff --git a/driver/src/main/java/org/neo4j/driver/internal/security/SecurityPlan.java b/driver/src/main/java/org/neo4j/driver/internal/security/SecurityPlan.java index 0bef2dbd82..0390f1c7ea 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/security/SecurityPlan.java +++ b/driver/src/main/java/org/neo4j/driver/internal/security/SecurityPlan.java @@ -19,7 +19,7 @@ package org.neo4j.driver.internal.security; import javax.net.ssl.SSLContext; -import org.neo4j.driver.internal.RevocationStrategy; +import org.neo4j.driver.RevocationStrategy; /** * A SecurityPlan consists of encryption and trust details. diff --git a/driver/src/main/java/org/neo4j/driver/internal/security/SecurityPlanImpl.java b/driver/src/main/java/org/neo4j/driver/internal/security/SecurityPlanImpl.java index ab95babf67..b3f1be0555 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/security/SecurityPlanImpl.java +++ b/driver/src/main/java/org/neo4j/driver/internal/security/SecurityPlanImpl.java @@ -18,8 +18,8 @@ */ package org.neo4j.driver.internal.security; -import static org.neo4j.driver.internal.RevocationStrategy.VERIFY_IF_PRESENT; -import static org.neo4j.driver.internal.RevocationStrategy.requiresRevocationChecking; +import static org.neo4j.driver.RevocationStrategy.VERIFY_IF_PRESENT; +import static org.neo4j.driver.RevocationStrategy.requiresRevocationChecking; import static org.neo4j.driver.internal.util.CertificateTool.loadX509Cert; import java.io.File; @@ -41,7 +41,7 @@ import javax.net.ssl.TrustManager; import javax.net.ssl.TrustManagerFactory; import javax.net.ssl.X509TrustManager; -import org.neo4j.driver.internal.RevocationStrategy; +import org.neo4j.driver.RevocationStrategy; /** * A SecurityPlan consists of encryption and trust details. diff --git a/driver/src/main/java/org/neo4j/driver/internal/svm/MicrometerSubstitutions.java b/driver/src/main/java/org/neo4j/driver/internal/svm/MicrometerSubstitutions.java index f871c114f1..69e717c26d 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/svm/MicrometerSubstitutions.java +++ b/driver/src/main/java/org/neo4j/driver/internal/svm/MicrometerSubstitutions.java @@ -33,7 +33,7 @@ final class Target_org_neo4j_driver_internal_DriverFactory { /** - * Substitutes metrics adatper in such a way that it falls back to off when Micrometer is not available. + * Substitutes metrics adapter in such a way that it falls back to off when Micrometer is not available. * * @param config Drivers config * @param clock Clock to use diff --git a/driver/src/main/java/org/neo4j/driver/internal/svm/NettySubstitutions.java b/driver/src/main/java/org/neo4j/driver/internal/svm/NettySubstitutions.java index 5ad8a1e93e..4ea0fb5c36 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/svm/NettySubstitutions.java +++ b/driver/src/main/java/org/neo4j/driver/internal/svm/NettySubstitutions.java @@ -123,6 +123,7 @@ final class Target_io_netty_handler_ssl_SslHandler$SslEngineType { } } +@SuppressWarnings("removal") @TargetClass( className = "io.netty.handler.ssl.JdkAlpnApplicationProtocolNegotiator$AlpnWrapper", onlyWith = JDK11OrLater.class) @@ -138,6 +139,7 @@ public SSLEngine wrapSslEngine( } } +@SuppressWarnings("removal") @TargetClass( className = "io.netty.handler.ssl.JdkAlpnApplicationProtocolNegotiator$AlpnWrapper", onlyWith = JDK8OrEarlier.class) @@ -160,6 +162,7 @@ public SSLEngine wrapSslEngine( } } +@SuppressWarnings("removal") @TargetClass(className = "io.netty.handler.ssl.JettyAlpnSslEngine", onlyWith = JDK8OrEarlier.class) final class Target_io_netty_handler_ssl_JettyAlpnSslEngine { @Substitute @@ -182,6 +185,7 @@ static Target_io_netty_handler_ssl_JettyAlpnSslEngine newServerEngine( } } +@SuppressWarnings("removal") @TargetClass(className = "io.netty.handler.ssl.JdkAlpnSslEngine", onlyWith = JDK11OrLater.class) final class Target_io_netty_handler_ssl_JdkAlpnSslEngine { diff --git a/driver/src/test/java/org/neo4j/driver/ConfigTest.java b/driver/src/test/java/org/neo4j/driver/ConfigTest.java index 8f177a6435..ac520b9dec 100644 --- a/driver/src/test/java/org/neo4j/driver/ConfigTest.java +++ b/driver/src/test/java/org/neo4j/driver/ConfigTest.java @@ -26,9 +26,9 @@ 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.neo4j.driver.internal.RevocationStrategy.NO_CHECKS; -import static org.neo4j.driver.internal.RevocationStrategy.STRICT; -import static org.neo4j.driver.internal.RevocationStrategy.VERIFY_IF_PRESENT; +import static org.neo4j.driver.RevocationStrategy.NO_CHECKS; +import static org.neo4j.driver.RevocationStrategy.STRICT; +import static org.neo4j.driver.RevocationStrategy.VERIFY_IF_PRESENT; import static org.neo4j.driver.internal.handlers.pulln.FetchSizeUtil.DEFAULT_FETCH_SIZE; import java.io.File; @@ -49,7 +49,7 @@ import org.neo4j.driver.internal.logging.JULogging; import org.neo4j.driver.internal.logging.Slf4jLogging; import org.neo4j.driver.net.ServerAddressResolver; -import org.neo4j.driver.util.TestUtil; +import org.neo4j.driver.testutil.TestUtil; class ConfigTest { @Test diff --git a/driver/src/test/java/org/neo4j/driver/GraphDatabaseTest.java b/driver/src/test/java/org/neo4j/driver/GraphDatabaseTest.java index 854bec853a..f888d4d403 100644 --- a/driver/src/test/java/org/neo4j/driver/GraphDatabaseTest.java +++ b/driver/src/test/java/org/neo4j/driver/GraphDatabaseTest.java @@ -50,7 +50,7 @@ import org.neo4j.driver.internal.retry.RetryLogic; import org.neo4j.driver.internal.security.SecurityPlan; import org.neo4j.driver.internal.spi.ConnectionPool; -import org.neo4j.driver.util.TestUtil; +import org.neo4j.driver.testutil.TestUtil; class GraphDatabaseTest { private static final Config INSECURE_CONFIG = diff --git a/driver/src/test/java/org/neo4j/driver/SessionConfigTest.java b/driver/src/test/java/org/neo4j/driver/SessionConfigTest.java index 91de0e5a74..69205f00a4 100644 --- a/driver/src/test/java/org/neo4j/driver/SessionConfigTest.java +++ b/driver/src/test/java/org/neo4j/driver/SessionConfigTest.java @@ -43,7 +43,7 @@ import org.junit.jupiter.params.provider.EnumSource; import org.junit.jupiter.params.provider.MethodSource; import org.junit.jupiter.params.provider.ValueSource; -import org.neo4j.driver.util.TestUtil; +import org.neo4j.driver.testutil.TestUtil; class SessionConfigTest { @Test diff --git a/driver/src/test/java/org/neo4j/driver/TransactionConfigTest.java b/driver/src/test/java/org/neo4j/driver/TransactionConfigTest.java index 3e07f12979..dbbabd00ce 100644 --- a/driver/src/test/java/org/neo4j/driver/TransactionConfigTest.java +++ b/driver/src/test/java/org/neo4j/driver/TransactionConfigTest.java @@ -33,7 +33,7 @@ import org.neo4j.driver.internal.InternalNode; import org.neo4j.driver.internal.InternalPath; import org.neo4j.driver.internal.InternalRelationship; -import org.neo4j.driver.util.TestUtil; +import org.neo4j.driver.testutil.TestUtil; class TransactionConfigTest { @Test diff --git a/driver/src/test/java/org/neo4j/driver/integration/BookmarkIT.java b/driver/src/test/java/org/neo4j/driver/integration/BookmarkIT.java index 1a7f5e1ada..2aefb2ccfd 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/BookmarkIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/BookmarkIT.java @@ -39,8 +39,8 @@ import org.neo4j.driver.internal.util.DisabledOnNeo4jWith; import org.neo4j.driver.internal.util.EnabledOnNeo4jWith; import org.neo4j.driver.internal.util.Neo4jFeature; -import org.neo4j.driver.util.ParallelizableIT; -import org.neo4j.driver.util.SessionExtension; +import org.neo4j.driver.testutil.ParallelizableIT; +import org.neo4j.driver.testutil.SessionExtension; @ParallelizableIT class BookmarkIT { diff --git a/driver/src/test/java/org/neo4j/driver/integration/ChannelConnectorImplIT.java b/driver/src/test/java/org/neo4j/driver/integration/ChannelConnectorImplIT.java index 1f2a1d6e9d..2583563415 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/ChannelConnectorImplIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/ChannelConnectorImplIT.java @@ -29,7 +29,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.neo4j.driver.internal.logging.DevNullLogging.DEV_NULL_LOGGING; -import static org.neo4j.driver.util.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.await; import io.netty.bootstrap.Bootstrap; import io.netty.channel.Channel; @@ -49,12 +49,12 @@ import org.junit.jupiter.api.extension.RegisterExtension; import org.neo4j.driver.AuthToken; import org.neo4j.driver.AuthTokens; +import org.neo4j.driver.RevocationStrategy; import org.neo4j.driver.exceptions.AuthenticationException; import org.neo4j.driver.exceptions.ServiceUnavailableException; import org.neo4j.driver.internal.BoltServerAddress; import org.neo4j.driver.internal.ConnectionSettings; import org.neo4j.driver.internal.DefaultDomainNameResolver; -import org.neo4j.driver.internal.RevocationStrategy; import org.neo4j.driver.internal.async.connection.BootstrapFactory; import org.neo4j.driver.internal.async.connection.ChannelConnector; import org.neo4j.driver.internal.async.connection.ChannelConnectorImpl; @@ -63,8 +63,8 @@ import org.neo4j.driver.internal.security.SecurityPlan; import org.neo4j.driver.internal.security.SecurityPlanImpl; import org.neo4j.driver.internal.util.FakeClock; -import org.neo4j.driver.util.DatabaseExtension; -import org.neo4j.driver.util.ParallelizableIT; +import org.neo4j.driver.testutil.DatabaseExtension; +import org.neo4j.driver.testutil.ParallelizableIT; @ParallelizableIT class ChannelConnectorImplIT { diff --git a/driver/src/test/java/org/neo4j/driver/integration/ConnectionHandlingIT.java b/driver/src/test/java/org/neo4j/driver/integration/ConnectionHandlingIT.java index 07b54e0989..cbbf4b9416 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/ConnectionHandlingIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/ConnectionHandlingIT.java @@ -32,7 +32,7 @@ import static org.mockito.Mockito.verify; import static org.neo4j.driver.Values.parameters; import static org.neo4j.driver.internal.util.Neo4jFeature.BOLT_V4; -import static org.neo4j.driver.util.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.await; import io.netty.bootstrap.Bootstrap; import java.util.List; @@ -76,8 +76,8 @@ import org.neo4j.driver.reactive.RxSession; import org.neo4j.driver.reactive.RxTransaction; import org.neo4j.driver.summary.ResultSummary; -import org.neo4j.driver.util.DatabaseExtension; -import org.neo4j.driver.util.ParallelizableIT; +import org.neo4j.driver.testutil.DatabaseExtension; +import org.neo4j.driver.testutil.ParallelizableIT; import org.reactivestreams.Publisher; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/driver/src/test/java/org/neo4j/driver/integration/ConnectionPoolIT.java b/driver/src/test/java/org/neo4j/driver/integration/ConnectionPoolIT.java index c9c7cf0d1f..a9295243f3 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/ConnectionPoolIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/ConnectionPoolIT.java @@ -48,8 +48,8 @@ import org.neo4j.driver.internal.security.SecurityPlanImpl; import org.neo4j.driver.internal.util.FakeClock; import org.neo4j.driver.internal.util.io.ChannelTrackingDriverFactory; -import org.neo4j.driver.util.DatabaseExtension; -import org.neo4j.driver.util.ParallelizableIT; +import org.neo4j.driver.testutil.DatabaseExtension; +import org.neo4j.driver.testutil.ParallelizableIT; @ParallelizableIT class ConnectionPoolIT { diff --git a/driver/src/test/java/org/neo4j/driver/integration/CredentialsIT.java b/driver/src/test/java/org/neo4j/driver/integration/CredentialsIT.java index 720f40c75f..b3ee52af7c 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/CredentialsIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/CredentialsIT.java @@ -39,8 +39,8 @@ import org.neo4j.driver.Value; import org.neo4j.driver.exceptions.AuthenticationException; import org.neo4j.driver.exceptions.SecurityException; -import org.neo4j.driver.util.DatabaseExtension; -import org.neo4j.driver.util.ParallelizableIT; +import org.neo4j.driver.testutil.DatabaseExtension; +import org.neo4j.driver.testutil.ParallelizableIT; @ParallelizableIT class CredentialsIT { diff --git a/driver/src/test/java/org/neo4j/driver/integration/DirectDriverIT.java b/driver/src/test/java/org/neo4j/driver/integration/DirectDriverIT.java index ecd2d3c2d0..0f5680244b 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/DirectDriverIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/DirectDriverIT.java @@ -31,8 +31,8 @@ import org.neo4j.driver.Driver; import org.neo4j.driver.GraphDatabase; import org.neo4j.driver.internal.BoltServerAddress; -import org.neo4j.driver.util.DatabaseExtension; -import org.neo4j.driver.util.ParallelizableIT; +import org.neo4j.driver.testutil.DatabaseExtension; +import org.neo4j.driver.testutil.ParallelizableIT; @ParallelizableIT class DirectDriverIT { diff --git a/driver/src/test/java/org/neo4j/driver/integration/DriverCloseIT.java b/driver/src/test/java/org/neo4j/driver/integration/DriverCloseIT.java index 93c27f75d8..442a76964f 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/DriverCloseIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/DriverCloseIT.java @@ -27,8 +27,8 @@ import org.neo4j.driver.Driver; import org.neo4j.driver.GraphDatabase; import org.neo4j.driver.Session; -import org.neo4j.driver.util.DatabaseExtension; -import org.neo4j.driver.util.ParallelizableIT; +import org.neo4j.driver.testutil.DatabaseExtension; +import org.neo4j.driver.testutil.ParallelizableIT; @ParallelizableIT class DriverCloseIT { diff --git a/driver/src/test/java/org/neo4j/driver/integration/EncryptionIT.java b/driver/src/test/java/org/neo4j/driver/integration/EncryptionIT.java index 2337b01aa9..b6c366ea3a 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/EncryptionIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/EncryptionIT.java @@ -37,10 +37,10 @@ import org.neo4j.driver.Session; import org.neo4j.driver.exceptions.ServiceUnavailableException; import org.neo4j.driver.internal.Scheme; -import org.neo4j.driver.util.DatabaseExtension; -import org.neo4j.driver.util.Neo4jSettings; -import org.neo4j.driver.util.Neo4jSettings.BoltTlsLevel; -import org.neo4j.driver.util.ParallelizableIT; +import org.neo4j.driver.testutil.DatabaseExtension; +import org.neo4j.driver.testutil.Neo4jSettings; +import org.neo4j.driver.testutil.Neo4jSettings.BoltTlsLevel; +import org.neo4j.driver.testutil.ParallelizableIT; @ParallelizableIT class EncryptionIT { diff --git a/driver/src/test/java/org/neo4j/driver/integration/EntityTypeIT.java b/driver/src/test/java/org/neo4j/driver/integration/EntityTypeIT.java index 5954ee8c14..ea5af47e0b 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/EntityTypeIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/EntityTypeIT.java @@ -24,11 +24,11 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.neo4j.driver.Result; +import org.neo4j.driver.testutil.ParallelizableIT; +import org.neo4j.driver.testutil.SessionExtension; import org.neo4j.driver.types.Node; import org.neo4j.driver.types.Path; import org.neo4j.driver.types.Relationship; -import org.neo4j.driver.util.ParallelizableIT; -import org.neo4j.driver.util.SessionExtension; @ParallelizableIT class EntityTypeIT { diff --git a/driver/src/test/java/org/neo4j/driver/integration/ErrorIT.java b/driver/src/test/java/org/neo4j/driver/integration/ErrorIT.java index 6c3104cf09..33edafd4a0 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/ErrorIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/ErrorIT.java @@ -65,8 +65,8 @@ import org.neo4j.driver.internal.util.FakeClock; import org.neo4j.driver.internal.util.io.ChannelTrackingDriverFactory; import org.neo4j.driver.internal.util.io.ChannelTrackingDriverFactoryWithFailingMessageFormat; -import org.neo4j.driver.util.ParallelizableIT; -import org.neo4j.driver.util.SessionExtension; +import org.neo4j.driver.testutil.ParallelizableIT; +import org.neo4j.driver.testutil.SessionExtension; @ParallelizableIT class ErrorIT { diff --git a/driver/src/test/java/org/neo4j/driver/integration/LoadCSVIT.java b/driver/src/test/java/org/neo4j/driver/integration/LoadCSVIT.java index 44abb08f48..58aef46a6e 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/LoadCSVIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/LoadCSVIT.java @@ -30,8 +30,8 @@ import org.neo4j.driver.GraphDatabase; import org.neo4j.driver.Result; import org.neo4j.driver.Session; -import org.neo4j.driver.util.DatabaseExtension; -import org.neo4j.driver.util.ParallelizableIT; +import org.neo4j.driver.testutil.DatabaseExtension; +import org.neo4j.driver.testutil.ParallelizableIT; @ParallelizableIT class LoadCSVIT { diff --git a/driver/src/test/java/org/neo4j/driver/integration/LoggingIT.java b/driver/src/test/java/org/neo4j/driver/integration/LoggingIT.java index 0b6fef5894..3a135fa1dc 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/LoggingIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/LoggingIT.java @@ -33,8 +33,8 @@ import org.neo4j.driver.Logger; import org.neo4j.driver.Logging; import org.neo4j.driver.Session; -import org.neo4j.driver.util.DatabaseExtension; -import org.neo4j.driver.util.ParallelizableIT; +import org.neo4j.driver.testutil.DatabaseExtension; +import org.neo4j.driver.testutil.ParallelizableIT; @ParallelizableIT class LoggingIT { diff --git a/driver/src/test/java/org/neo4j/driver/integration/MetricsIT.java b/driver/src/test/java/org/neo4j/driver/integration/MetricsIT.java index 70d74f7bfa..fc6e7f3b39 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/MetricsIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/MetricsIT.java @@ -34,8 +34,8 @@ import org.neo4j.driver.MetricsAdapter; import org.neo4j.driver.QueryRunner; import org.neo4j.driver.Result; -import org.neo4j.driver.util.DatabaseExtension; -import org.neo4j.driver.util.ParallelizableIT; +import org.neo4j.driver.testutil.DatabaseExtension; +import org.neo4j.driver.testutil.ParallelizableIT; @ParallelizableIT class MetricsIT { diff --git a/driver/src/test/java/org/neo4j/driver/integration/ParametersIT.java b/driver/src/test/java/org/neo4j/driver/integration/ParametersIT.java index eb89acc37e..6297e20b1f 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/ParametersIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/ParametersIT.java @@ -48,9 +48,9 @@ import org.neo4j.driver.exceptions.ClientException; import org.neo4j.driver.exceptions.ServiceUnavailableException; import org.neo4j.driver.internal.value.MapValue; -import org.neo4j.driver.util.ParallelizableIT; -import org.neo4j.driver.util.SessionExtension; -import org.neo4j.driver.util.TestUtil; +import org.neo4j.driver.testutil.ParallelizableIT; +import org.neo4j.driver.testutil.SessionExtension; +import org.neo4j.driver.testutil.TestUtil; @ParallelizableIT class ParametersIT { diff --git a/driver/src/test/java/org/neo4j/driver/integration/QueryIT.java b/driver/src/test/java/org/neo4j/driver/integration/QueryIT.java index 14406acbc9..2fe4ffe8c8 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/QueryIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/QueryIT.java @@ -23,7 +23,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.neo4j.driver.Values.parameters; -import static org.neo4j.driver.util.TestUtil.assertNoCircularReferences; +import static org.neo4j.driver.testutil.TestUtil.assertNoCircularReferences; import java.util.Collections; import java.util.Iterator; @@ -35,8 +35,8 @@ import org.neo4j.driver.Result; import org.neo4j.driver.Value; import org.neo4j.driver.Values; -import org.neo4j.driver.util.ParallelizableIT; -import org.neo4j.driver.util.SessionExtension; +import org.neo4j.driver.testutil.ParallelizableIT; +import org.neo4j.driver.testutil.SessionExtension; @ParallelizableIT class QueryIT { diff --git a/driver/src/test/java/org/neo4j/driver/integration/QueryRunnerCloseIT.java b/driver/src/test/java/org/neo4j/driver/integration/QueryRunnerCloseIT.java index cd0221f7e5..720d589811 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/QueryRunnerCloseIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/QueryRunnerCloseIT.java @@ -20,7 +20,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.neo4j.driver.util.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.await; import java.util.List; import java.util.concurrent.ExecutorService; @@ -34,8 +34,8 @@ import org.neo4j.driver.async.ResultCursor; import org.neo4j.driver.exceptions.ResultConsumedException; import org.neo4j.driver.summary.ResultSummary; -import org.neo4j.driver.util.DatabaseExtension; -import org.neo4j.driver.util.ParallelizableIT; +import org.neo4j.driver.testutil.DatabaseExtension; +import org.neo4j.driver.testutil.ParallelizableIT; @ParallelizableIT class QueryRunnerCloseIT { diff --git a/driver/src/test/java/org/neo4j/driver/integration/ResultStreamIT.java b/driver/src/test/java/org/neo4j/driver/integration/ResultStreamIT.java index e591f6b8b6..dc462d5a48 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/ResultStreamIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/ResultStreamIT.java @@ -43,8 +43,8 @@ import org.neo4j.driver.Value; import org.neo4j.driver.exceptions.ClientException; import org.neo4j.driver.exceptions.NoSuchRecordException; -import org.neo4j.driver.util.ParallelizableIT; -import org.neo4j.driver.util.SessionExtension; +import org.neo4j.driver.testutil.ParallelizableIT; +import org.neo4j.driver.testutil.SessionExtension; @ParallelizableIT class ResultStreamIT { diff --git a/driver/src/test/java/org/neo4j/driver/integration/RoutingDriverIT.java b/driver/src/test/java/org/neo4j/driver/integration/RoutingDriverIT.java index b877b5c2ff..e328682204 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/RoutingDriverIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/RoutingDriverIT.java @@ -33,8 +33,8 @@ import org.neo4j.driver.Session; import org.neo4j.driver.internal.util.EnabledOnNeo4jWith; import org.neo4j.driver.internal.util.Neo4jFeature; -import org.neo4j.driver.util.DatabaseExtension; -import org.neo4j.driver.util.ParallelizableIT; +import org.neo4j.driver.testutil.DatabaseExtension; +import org.neo4j.driver.testutil.ParallelizableIT; @ParallelizableIT @EnabledOnNeo4jWith(Neo4jFeature.BOLT_V4) diff --git a/driver/src/test/java/org/neo4j/driver/integration/ScalarTypeIT.java b/driver/src/test/java/org/neo4j/driver/integration/ScalarTypeIT.java index df81c199a0..d8c02409b9 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/ScalarTypeIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/ScalarTypeIT.java @@ -42,8 +42,8 @@ import org.neo4j.driver.internal.value.MapValue; import org.neo4j.driver.internal.value.NullValue; import org.neo4j.driver.internal.value.StringValue; -import org.neo4j.driver.util.ParallelizableIT; -import org.neo4j.driver.util.SessionExtension; +import org.neo4j.driver.testutil.ParallelizableIT; +import org.neo4j.driver.testutil.SessionExtension; @ParallelizableIT class ScalarTypeIT { diff --git a/driver/src/test/java/org/neo4j/driver/integration/ServerKilledIT.java b/driver/src/test/java/org/neo4j/driver/integration/ServerKilledIT.java index cc15f8df61..a2b1739adf 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/ServerKilledIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/ServerKilledIT.java @@ -42,8 +42,8 @@ import org.neo4j.driver.internal.util.Clock; import org.neo4j.driver.internal.util.DriverFactoryWithClock; import org.neo4j.driver.internal.util.FakeClock; -import org.neo4j.driver.util.DatabaseExtension; -import org.neo4j.driver.util.ParallelizableIT; +import org.neo4j.driver.testutil.DatabaseExtension; +import org.neo4j.driver.testutil.ParallelizableIT; /** * Mainly concerned about the connection pool - we want to make sure that bad connections are evacuated from the diff --git a/driver/src/test/java/org/neo4j/driver/integration/SessionBoltV3IT.java b/driver/src/test/java/org/neo4j/driver/integration/SessionBoltV3IT.java index b185bcd955..fd83bf1e2e 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/SessionBoltV3IT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/SessionBoltV3IT.java @@ -32,8 +32,8 @@ import static org.junit.jupiter.api.Assertions.fail; import static org.neo4j.driver.Config.defaultConfig; import static org.neo4j.driver.internal.util.Neo4jFeature.BOLT_V3; -import static org.neo4j.driver.util.TestUtil.TX_TIMEOUT_TEST_TIMEOUT; -import static org.neo4j.driver.util.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.TX_TIMEOUT_TEST_TIMEOUT; +import static org.neo4j.driver.testutil.TestUtil.await; import io.netty.channel.Channel; import java.time.LocalDate; @@ -65,8 +65,8 @@ import org.neo4j.driver.internal.util.EnabledOnNeo4jWith; import org.neo4j.driver.internal.util.MessageRecordingDriverFactory; import org.neo4j.driver.summary.ResultSummary; -import org.neo4j.driver.util.DriverExtension; -import org.neo4j.driver.util.ParallelizableIT; +import org.neo4j.driver.testutil.DriverExtension; +import org.neo4j.driver.testutil.ParallelizableIT; @EnabledOnNeo4jWith(BOLT_V3) @ParallelizableIT diff --git a/driver/src/test/java/org/neo4j/driver/integration/SessionIT.java b/driver/src/test/java/org/neo4j/driver/integration/SessionIT.java index a16da7ac4a..9bd03b8ab2 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/SessionIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/SessionIT.java @@ -49,7 +49,7 @@ import static org.neo4j.driver.internal.util.Matchers.arithmeticError; import static org.neo4j.driver.internal.util.Matchers.connectionAcquisitionTimeoutError; import static org.neo4j.driver.internal.util.Neo4jFeature.BOLT_V4; -import static org.neo4j.driver.util.DaemonThreadFactory.daemon; +import static org.neo4j.driver.testutil.DaemonThreadFactory.daemon; import java.util.HashSet; import java.util.List; @@ -93,9 +93,9 @@ import org.neo4j.driver.reactive.RxSession; import org.neo4j.driver.summary.QueryType; import org.neo4j.driver.summary.ResultSummary; -import org.neo4j.driver.util.DatabaseExtension; -import org.neo4j.driver.util.ParallelizableIT; -import org.neo4j.driver.util.TestUtil; +import org.neo4j.driver.testutil.DatabaseExtension; +import org.neo4j.driver.testutil.ParallelizableIT; +import org.neo4j.driver.testutil.TestUtil; import reactor.test.StepVerifier; @ParallelizableIT diff --git a/driver/src/test/java/org/neo4j/driver/integration/SessionMixIT.java b/driver/src/test/java/org/neo4j/driver/integration/SessionMixIT.java index 774f8b1a2a..6c9503dc51 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/SessionMixIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/SessionMixIT.java @@ -26,7 +26,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.neo4j.driver.Values.parameters; import static org.neo4j.driver.internal.util.Matchers.blockingOperationInEventLoopError; -import static org.neo4j.driver.util.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.await; import java.util.List; import java.util.concurrent.CompletableFuture; @@ -46,9 +46,9 @@ import org.neo4j.driver.async.ResultCursor; import org.neo4j.driver.internal.async.connection.EventLoopGroupFactory; import org.neo4j.driver.internal.util.Futures; +import org.neo4j.driver.testutil.DatabaseExtension; +import org.neo4j.driver.testutil.ParallelizableIT; import org.neo4j.driver.types.Node; -import org.neo4j.driver.util.DatabaseExtension; -import org.neo4j.driver.util.ParallelizableIT; @ParallelizableIT class SessionMixIT { diff --git a/driver/src/test/java/org/neo4j/driver/integration/SharedEventLoopIT.java b/driver/src/test/java/org/neo4j/driver/integration/SharedEventLoopIT.java index faa3a9b6e0..3c99087844 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/SharedEventLoopIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/SharedEventLoopIT.java @@ -32,8 +32,8 @@ import org.neo4j.driver.internal.cluster.RoutingSettings; import org.neo4j.driver.internal.retry.RetrySettings; import org.neo4j.driver.internal.security.SecurityPlanImpl; -import org.neo4j.driver.util.DatabaseExtension; -import org.neo4j.driver.util.ParallelizableIT; +import org.neo4j.driver.testutil.DatabaseExtension; +import org.neo4j.driver.testutil.ParallelizableIT; @ParallelizableIT class SharedEventLoopIT { diff --git a/driver/src/test/java/org/neo4j/driver/integration/SpatialTypesIT.java b/driver/src/test/java/org/neo4j/driver/integration/SpatialTypesIT.java index ff143ddda9..e01a7e4272 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/SpatialTypesIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/SpatialTypesIT.java @@ -34,9 +34,9 @@ import org.neo4j.driver.Record; import org.neo4j.driver.Value; import org.neo4j.driver.internal.util.EnabledOnNeo4jWith; +import org.neo4j.driver.testutil.ParallelizableIT; +import org.neo4j.driver.testutil.SessionExtension; import org.neo4j.driver.types.Point; -import org.neo4j.driver.util.ParallelizableIT; -import org.neo4j.driver.util.SessionExtension; @EnabledOnNeo4jWith(SPATIAL_TYPES) @ParallelizableIT diff --git a/driver/src/test/java/org/neo4j/driver/integration/SummaryIT.java b/driver/src/test/java/org/neo4j/driver/integration/SummaryIT.java index b33651c768..8d1abc90fc 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/SummaryIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/SummaryIT.java @@ -46,8 +46,8 @@ import org.neo4j.driver.summary.ProfiledPlan; import org.neo4j.driver.summary.QueryType; import org.neo4j.driver.summary.ResultSummary; -import org.neo4j.driver.util.DatabaseExtension; -import org.neo4j.driver.util.ParallelizableIT; +import org.neo4j.driver.testutil.DatabaseExtension; +import org.neo4j.driver.testutil.ParallelizableIT; @ParallelizableIT class SummaryIT { diff --git a/driver/src/test/java/org/neo4j/driver/integration/TemporalTypesIT.java b/driver/src/test/java/org/neo4j/driver/integration/TemporalTypesIT.java index e763bcef93..8d9558ceb0 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/TemporalTypesIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/TemporalTypesIT.java @@ -48,10 +48,10 @@ import org.neo4j.driver.internal.util.DisabledOnNeo4jWith; import org.neo4j.driver.internal.util.EnabledOnNeo4jWith; import org.neo4j.driver.internal.util.Neo4jFeature; +import org.neo4j.driver.testutil.ParallelizableIT; +import org.neo4j.driver.testutil.SessionExtension; +import org.neo4j.driver.testutil.TemporalUtil; import org.neo4j.driver.types.IsoDuration; -import org.neo4j.driver.util.ParallelizableIT; -import org.neo4j.driver.util.SessionExtension; -import org.neo4j.driver.util.TemporalUtil; @EnabledOnNeo4jWith(TEMPORAL_TYPES) @ParallelizableIT diff --git a/driver/src/test/java/org/neo4j/driver/integration/TransactionBoltV3IT.java b/driver/src/test/java/org/neo4j/driver/integration/TransactionBoltV3IT.java index 5a2fa42492..b3aa4e222c 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/TransactionBoltV3IT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/TransactionBoltV3IT.java @@ -27,8 +27,8 @@ import static org.junit.jupiter.api.Assertions.fail; import static org.neo4j.driver.internal.util.Neo4jFeature.BOLT_V3; import static org.neo4j.driver.internal.util.Neo4jFeature.BOLT_V5; -import static org.neo4j.driver.util.TestUtil.TX_TIMEOUT_TEST_TIMEOUT; -import static org.neo4j.driver.util.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.TX_TIMEOUT_TEST_TIMEOUT; +import static org.neo4j.driver.testutil.TestUtil.await; import java.time.ZonedDateTime; import java.util.HashMap; @@ -49,8 +49,8 @@ import org.neo4j.driver.exceptions.TransientException; import org.neo4j.driver.internal.util.DisabledOnNeo4jWith; import org.neo4j.driver.internal.util.EnabledOnNeo4jWith; -import org.neo4j.driver.util.DriverExtension; -import org.neo4j.driver.util.ParallelizableIT; +import org.neo4j.driver.testutil.DriverExtension; +import org.neo4j.driver.testutil.ParallelizableIT; @EnabledOnNeo4jWith(BOLT_V3) @ParallelizableIT diff --git a/driver/src/test/java/org/neo4j/driver/integration/TransactionIT.java b/driver/src/test/java/org/neo4j/driver/integration/TransactionIT.java index ea1c0b3611..bc95380e02 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/TransactionIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/TransactionIT.java @@ -29,7 +29,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.neo4j.driver.internal.logging.DevNullLogging.DEV_NULL_LOGGING; import static org.neo4j.driver.internal.retry.RetrySettings.DEFAULT; -import static org.neo4j.driver.util.TestUtil.assertNoCircularReferences; +import static org.neo4j.driver.testutil.TestUtil.assertNoCircularReferences; import io.netty.channel.Channel; import java.util.List; @@ -50,9 +50,9 @@ import org.neo4j.driver.internal.security.SecurityPlanImpl; import org.neo4j.driver.internal.util.Clock; import org.neo4j.driver.internal.util.io.ChannelTrackingDriverFactory; -import org.neo4j.driver.util.ParallelizableIT; -import org.neo4j.driver.util.SessionExtension; -import org.neo4j.driver.util.TestUtil; +import org.neo4j.driver.testutil.ParallelizableIT; +import org.neo4j.driver.testutil.SessionExtension; +import org.neo4j.driver.testutil.TestUtil; @ParallelizableIT class TransactionIT { diff --git a/driver/src/test/java/org/neo4j/driver/integration/TrustCustomCertificateIT.java b/driver/src/test/java/org/neo4j/driver/integration/TrustCustomCertificateIT.java index b327ac1250..c8c7358813 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/TrustCustomCertificateIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/TrustCustomCertificateIT.java @@ -22,9 +22,9 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.neo4j.driver.Config.TrustStrategy.trustCustomCertificateSignedBy; -import static org.neo4j.driver.util.CertificateUtil.createNewCertificateAndKey; -import static org.neo4j.driver.util.CertificateUtil.createNewCertificateAndKeySignedBy; -import static org.neo4j.driver.util.DatabaseExtension.getDockerHostGeneralName; +import static org.neo4j.driver.testutil.CertificateUtil.createNewCertificateAndKey; +import static org.neo4j.driver.testutil.CertificateUtil.createNewCertificateAndKeySignedBy; +import static org.neo4j.driver.testutil.DatabaseExtension.getDockerHostGeneralName; import java.io.File; import java.util.function.Supplier; @@ -36,9 +36,9 @@ import org.neo4j.driver.Result; import org.neo4j.driver.Session; import org.neo4j.driver.exceptions.SecurityException; -import org.neo4j.driver.util.CertificateUtil.CertificateKeyPair; -import org.neo4j.driver.util.DatabaseExtension; -import org.neo4j.driver.util.ParallelizableIT; +import org.neo4j.driver.testutil.CertificateUtil.CertificateKeyPair; +import org.neo4j.driver.testutil.DatabaseExtension; +import org.neo4j.driver.testutil.ParallelizableIT; @ParallelizableIT class TrustCustomCertificateIT { diff --git a/driver/src/test/java/org/neo4j/driver/integration/UnmanagedTransactionIT.java b/driver/src/test/java/org/neo4j/driver/integration/UnmanagedTransactionIT.java index 504ee42a64..d6a0df7f51 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/UnmanagedTransactionIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/UnmanagedTransactionIT.java @@ -27,7 +27,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.neo4j.driver.Values.parameters; import static org.neo4j.driver.internal.logging.DevNullLogging.DEV_NULL_LOGGING; -import static org.neo4j.driver.util.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.await; import io.netty.channel.Channel; import io.netty.channel.ChannelPipeline; @@ -54,8 +54,8 @@ import org.neo4j.driver.internal.security.SecurityPlanImpl; import org.neo4j.driver.internal.util.Clock; import org.neo4j.driver.internal.util.io.ChannelTrackingDriverFactory; -import org.neo4j.driver.util.DatabaseExtension; -import org.neo4j.driver.util.ParallelizableIT; +import org.neo4j.driver.testutil.DatabaseExtension; +import org.neo4j.driver.testutil.ParallelizableIT; @ParallelizableIT class UnmanagedTransactionIT { diff --git a/driver/src/test/java/org/neo4j/driver/integration/UnsupportedBoltV3IT.java b/driver/src/test/java/org/neo4j/driver/integration/UnsupportedBoltV3IT.java index 75b7c33e72..555d67acba 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/UnsupportedBoltV3IT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/UnsupportedBoltV3IT.java @@ -24,7 +24,7 @@ import static org.hamcrest.Matchers.startsWith; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.neo4j.driver.internal.util.Neo4jFeature.BOLT_V3; -import static org.neo4j.driver.util.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.await; import java.util.concurrent.CompletionStage; import org.junit.jupiter.api.Test; @@ -33,8 +33,8 @@ import org.neo4j.driver.TransactionConfig; import org.neo4j.driver.exceptions.ClientException; import org.neo4j.driver.internal.util.DisabledOnNeo4jWith; -import org.neo4j.driver.util.DriverExtension; -import org.neo4j.driver.util.ParallelizableIT; +import org.neo4j.driver.testutil.DriverExtension; +import org.neo4j.driver.testutil.ParallelizableIT; @DisabledOnNeo4jWith(BOLT_V3) @ParallelizableIT diff --git a/driver/src/test/java/org/neo4j/driver/integration/async/AsyncQueryIT.java b/driver/src/test/java/org/neo4j/driver/integration/async/AsyncQueryIT.java index b0fcafeb98..8c1f13700e 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/async/AsyncQueryIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/async/AsyncQueryIT.java @@ -19,7 +19,7 @@ package org.neo4j.driver.integration.async; import static org.neo4j.driver.Values.parameters; -import static org.neo4j.driver.util.TestUtil.assertNoCircularReferences; +import static org.neo4j.driver.testutil.TestUtil.assertNoCircularReferences; import java.util.ArrayList; import java.util.concurrent.ExecutionException; @@ -28,8 +28,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.neo4j.driver.async.AsyncSession; -import org.neo4j.driver.util.DatabaseExtension; -import org.neo4j.driver.util.ParallelizableIT; +import org.neo4j.driver.testutil.DatabaseExtension; +import org.neo4j.driver.testutil.ParallelizableIT; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/driver/src/test/java/org/neo4j/driver/integration/async/AsyncSessionIT.java b/driver/src/test/java/org/neo4j/driver/integration/async/AsyncSessionIT.java index e028a6bec5..fcdb0a12d8 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/async/AsyncSessionIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/async/AsyncSessionIT.java @@ -41,9 +41,9 @@ import static org.neo4j.driver.internal.util.Matchers.syntaxError; import static org.neo4j.driver.internal.util.Neo4jFeature.BOLT_V3; import static org.neo4j.driver.internal.util.Neo4jFeature.BOLT_V4; -import static org.neo4j.driver.util.TestUtil.assertNoCircularReferences; -import static org.neo4j.driver.util.TestUtil.await; -import static org.neo4j.driver.util.TestUtil.awaitAll; +import static org.neo4j.driver.testutil.TestUtil.assertNoCircularReferences; +import static org.neo4j.driver.testutil.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.awaitAll; import java.io.IOException; import java.util.ArrayList; @@ -81,9 +81,9 @@ import org.neo4j.driver.internal.util.Futures; import org.neo4j.driver.summary.QueryType; import org.neo4j.driver.summary.ResultSummary; +import org.neo4j.driver.testutil.DatabaseExtension; +import org.neo4j.driver.testutil.ParallelizableIT; import org.neo4j.driver.types.Node; -import org.neo4j.driver.util.DatabaseExtension; -import org.neo4j.driver.util.ParallelizableIT; @ParallelizableIT class AsyncSessionIT { diff --git a/driver/src/test/java/org/neo4j/driver/integration/async/AsyncSessionServerRestartIT.java b/driver/src/test/java/org/neo4j/driver/integration/async/AsyncSessionServerRestartIT.java index 0db23e4ec6..c298147c07 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/async/AsyncSessionServerRestartIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/async/AsyncSessionServerRestartIT.java @@ -21,7 +21,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.neo4j.driver.util.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.await; import java.util.List; import org.junit.jupiter.api.AfterEach; @@ -33,8 +33,8 @@ import org.neo4j.driver.async.AsyncTransaction; import org.neo4j.driver.async.ResultCursor; import org.neo4j.driver.exceptions.ServiceUnavailableException; -import org.neo4j.driver.util.DatabaseExtension; -import org.neo4j.driver.util.ParallelizableIT; +import org.neo4j.driver.testutil.DatabaseExtension; +import org.neo4j.driver.testutil.ParallelizableIT; @ParallelizableIT class AsyncSessionServerRestartIT { diff --git a/driver/src/test/java/org/neo4j/driver/integration/async/AsyncTransactionIT.java b/driver/src/test/java/org/neo4j/driver/integration/async/AsyncTransactionIT.java index b1d1cb7abe..94f6af5f9f 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/async/AsyncTransactionIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/async/AsyncTransactionIT.java @@ -37,8 +37,8 @@ import static org.neo4j.driver.internal.util.Iterables.single; import static org.neo4j.driver.internal.util.Matchers.containsResultAvailableAfterAndResultConsumedAfter; import static org.neo4j.driver.internal.util.Matchers.syntaxError; -import static org.neo4j.driver.util.TestUtil.assertNoCircularReferences; -import static org.neo4j.driver.util.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.assertNoCircularReferences; +import static org.neo4j.driver.testutil.TestUtil.await; import java.io.IOException; import java.util.ArrayList; @@ -66,9 +66,9 @@ import org.neo4j.driver.exceptions.ServiceUnavailableException; import org.neo4j.driver.summary.QueryType; import org.neo4j.driver.summary.ResultSummary; +import org.neo4j.driver.testutil.DatabaseExtension; +import org.neo4j.driver.testutil.ParallelizableIT; import org.neo4j.driver.types.Node; -import org.neo4j.driver.util.DatabaseExtension; -import org.neo4j.driver.util.ParallelizableIT; @ParallelizableIT class AsyncTransactionIT { diff --git a/driver/src/test/java/org/neo4j/driver/integration/reactive/RxNestedQueriesIT.java b/driver/src/test/java/org/neo4j/driver/integration/reactive/RxNestedQueriesIT.java index 46c680fa70..19f4dbbe64 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/reactive/RxNestedQueriesIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/reactive/RxNestedQueriesIT.java @@ -28,8 +28,8 @@ import org.neo4j.driver.reactive.RxResult; import org.neo4j.driver.reactive.RxSession; import org.neo4j.driver.reactive.RxTransaction; -import org.neo4j.driver.util.DatabaseExtension; -import org.neo4j.driver.util.ParallelizableIT; +import org.neo4j.driver.testutil.DatabaseExtension; +import org.neo4j.driver.testutil.ParallelizableIT; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; diff --git a/driver/src/test/java/org/neo4j/driver/integration/reactive/RxResultIT.java b/driver/src/test/java/org/neo4j/driver/integration/reactive/RxResultIT.java index 9b049d39b2..bb801fcd36 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/reactive/RxResultIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/reactive/RxResultIT.java @@ -42,8 +42,8 @@ import org.neo4j.driver.reactive.RxSession; import org.neo4j.driver.summary.QueryType; import org.neo4j.driver.summary.ResultSummary; -import org.neo4j.driver.util.DatabaseExtension; -import org.neo4j.driver.util.ParallelizableIT; +import org.neo4j.driver.testutil.DatabaseExtension; +import org.neo4j.driver.testutil.ParallelizableIT; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; diff --git a/driver/src/test/java/org/neo4j/driver/integration/reactive/RxSessionIT.java b/driver/src/test/java/org/neo4j/driver/integration/reactive/RxSessionIT.java index 8b2c80d78f..c7c8fa8c86 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/reactive/RxSessionIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/reactive/RxSessionIT.java @@ -44,8 +44,8 @@ import org.neo4j.driver.reactive.RxSession; import org.neo4j.driver.reactive.RxTransaction; import org.neo4j.driver.reactive.RxTransactionWork; -import org.neo4j.driver.util.DatabaseExtension; -import org.neo4j.driver.util.ParallelizableIT; +import org.neo4j.driver.testutil.DatabaseExtension; +import org.neo4j.driver.testutil.ParallelizableIT; import org.reactivestreams.Publisher; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/driver/src/test/java/org/neo4j/driver/integration/reactive/RxTransactionIT.java b/driver/src/test/java/org/neo4j/driver/integration/reactive/RxTransactionIT.java index 2767004569..db1352c9c4 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/reactive/RxTransactionIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/reactive/RxTransactionIT.java @@ -40,7 +40,7 @@ import static org.neo4j.driver.internal.util.Matchers.containsResultAvailableAfterAndResultConsumedAfter; import static org.neo4j.driver.internal.util.Matchers.syntaxError; import static org.neo4j.driver.internal.util.Neo4jFeature.BOLT_V4; -import static org.neo4j.driver.util.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.await; import java.util.ArrayList; import java.util.Arrays; @@ -68,9 +68,9 @@ import org.neo4j.driver.reactive.RxTransaction; import org.neo4j.driver.summary.QueryType; import org.neo4j.driver.summary.ResultSummary; +import org.neo4j.driver.testutil.DatabaseExtension; +import org.neo4j.driver.testutil.ParallelizableIT; import org.neo4j.driver.types.Node; -import org.neo4j.driver.util.DatabaseExtension; -import org.neo4j.driver.util.ParallelizableIT; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; diff --git a/driver/src/test/java/org/neo4j/driver/internal/DirectConnectionProviderTest.java b/driver/src/test/java/org/neo4j/driver/internal/DirectConnectionProviderTest.java index 3c36e8e189..8461a4cbca 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/DirectConnectionProviderTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/DirectConnectionProviderTest.java @@ -32,7 +32,7 @@ import static org.neo4j.driver.AccessMode.WRITE; import static org.neo4j.driver.internal.cluster.RediscoveryUtil.contextWithDatabase; import static org.neo4j.driver.internal.cluster.RediscoveryUtil.contextWithMode; -import static org.neo4j.driver.util.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.await; import java.util.concurrent.CompletableFuture; import java.util.stream.Stream; diff --git a/driver/src/test/java/org/neo4j/driver/internal/InternalBookmarkTest.java b/driver/src/test/java/org/neo4j/driver/internal/InternalBookmarkTest.java index c51c939003..78fb79150b 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/InternalBookmarkTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/InternalBookmarkTest.java @@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.neo4j.driver.internal.InternalBookmark.parse; -import static org.neo4j.driver.util.TestUtil.asSet; +import static org.neo4j.driver.testutil.TestUtil.asSet; import java.util.Arrays; import java.util.Set; diff --git a/driver/src/test/java/org/neo4j/driver/internal/InternalDriverTest.java b/driver/src/test/java/org/neo4j/driver/internal/InternalDriverTest.java index 7604191919..44fefb1077 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/InternalDriverTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/InternalDriverTest.java @@ -29,7 +29,7 @@ import static org.neo4j.driver.internal.logging.DevNullLogging.DEV_NULL_LOGGING; import static org.neo4j.driver.internal.util.Futures.completedWithNull; import static org.neo4j.driver.internal.util.Futures.failedFuture; -import static org.neo4j.driver.util.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.await; import java.util.concurrent.CompletableFuture; import org.junit.jupiter.api.Test; diff --git a/driver/src/test/java/org/neo4j/driver/internal/InternalTransactionTest.java b/driver/src/test/java/org/neo4j/driver/internal/InternalTransactionTest.java index 00ab04bc8e..b546b58442 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/InternalTransactionTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/InternalTransactionTest.java @@ -28,15 +28,15 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.neo4j.driver.Values.parameters; -import static org.neo4j.driver.util.TestUtil.connectionMock; -import static org.neo4j.driver.util.TestUtil.newSession; -import static org.neo4j.driver.util.TestUtil.setupFailingCommit; -import static org.neo4j.driver.util.TestUtil.setupFailingRollback; -import static org.neo4j.driver.util.TestUtil.setupFailingRun; -import static org.neo4j.driver.util.TestUtil.setupSuccessfulRunAndPull; -import static org.neo4j.driver.util.TestUtil.verifyCommitTx; -import static org.neo4j.driver.util.TestUtil.verifyRollbackTx; -import static org.neo4j.driver.util.TestUtil.verifyRunAndPull; +import static org.neo4j.driver.testutil.TestUtil.connectionMock; +import static org.neo4j.driver.testutil.TestUtil.newSession; +import static org.neo4j.driver.testutil.TestUtil.setupFailingCommit; +import static org.neo4j.driver.testutil.TestUtil.setupFailingRollback; +import static org.neo4j.driver.testutil.TestUtil.setupFailingRun; +import static org.neo4j.driver.testutil.TestUtil.setupSuccessfulRunAndPull; +import static org.neo4j.driver.testutil.TestUtil.verifyCommitTx; +import static org.neo4j.driver.testutil.TestUtil.verifyRollbackTx; +import static org.neo4j.driver.testutil.TestUtil.verifyRunAndPull; import java.util.function.Consumer; import java.util.function.Function; diff --git a/driver/src/test/java/org/neo4j/driver/internal/SecuritySettingsTest.java b/driver/src/test/java/org/neo4j/driver/internal/SecuritySettingsTest.java index 3ae24dc61f..b2aaa8baeb 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/SecuritySettingsTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/SecuritySettingsTest.java @@ -22,9 +22,9 @@ 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.driver.internal.RevocationStrategy.NO_CHECKS; -import static org.neo4j.driver.internal.RevocationStrategy.STRICT; -import static org.neo4j.driver.internal.RevocationStrategy.VERIFY_IF_PRESENT; +import static org.neo4j.driver.RevocationStrategy.NO_CHECKS; +import static org.neo4j.driver.RevocationStrategy.STRICT; +import static org.neo4j.driver.RevocationStrategy.VERIFY_IF_PRESENT; import java.io.File; import java.io.IOException; @@ -39,7 +39,7 @@ import org.neo4j.driver.Config; import org.neo4j.driver.exceptions.ClientException; import org.neo4j.driver.internal.security.SecurityPlan; -import org.neo4j.driver.util.TestUtil; +import org.neo4j.driver.testutil.TestUtil; class SecuritySettingsTest { private static Stream selfSignedSchemes() { diff --git a/driver/src/test/java/org/neo4j/driver/internal/async/AsyncResultCursorImplTest.java b/driver/src/test/java/org/neo4j/driver/internal/async/AsyncResultCursorImplTest.java index 892c644ebe..e347427fcb 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/async/AsyncResultCursorImplTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/async/AsyncResultCursorImplTest.java @@ -37,7 +37,7 @@ import static org.neo4j.driver.internal.summary.InternalDatabaseInfo.DEFAULT_DATABASE_INFO; import static org.neo4j.driver.internal.util.Futures.completedWithNull; import static org.neo4j.driver.internal.util.Futures.failedFuture; -import static org.neo4j.driver.util.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.await; import java.util.List; import java.util.concurrent.CompletableFuture; diff --git a/driver/src/test/java/org/neo4j/driver/internal/async/InternalAsyncSessionTest.java b/driver/src/test/java/org/neo4j/driver/internal/async/InternalAsyncSessionTest.java index e745ab204b..87647ac313 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/async/InternalAsyncSessionTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/async/InternalAsyncSessionTest.java @@ -41,15 +41,15 @@ import static org.neo4j.driver.AccessMode.WRITE; import static org.neo4j.driver.TransactionConfig.empty; import static org.neo4j.driver.Values.parameters; -import static org.neo4j.driver.util.TestUtil.await; -import static org.neo4j.driver.util.TestUtil.connectionMock; -import static org.neo4j.driver.util.TestUtil.newSession; -import static org.neo4j.driver.util.TestUtil.setupFailingCommit; -import static org.neo4j.driver.util.TestUtil.setupSuccessfulRunAndPull; -import static org.neo4j.driver.util.TestUtil.verifyBeginTx; -import static org.neo4j.driver.util.TestUtil.verifyCommitTx; -import static org.neo4j.driver.util.TestUtil.verifyRollbackTx; -import static org.neo4j.driver.util.TestUtil.verifyRunAndPull; +import static org.neo4j.driver.testutil.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.connectionMock; +import static org.neo4j.driver.testutil.TestUtil.newSession; +import static org.neo4j.driver.testutil.TestUtil.setupFailingCommit; +import static org.neo4j.driver.testutil.TestUtil.setupSuccessfulRunAndPull; +import static org.neo4j.driver.testutil.TestUtil.verifyBeginTx; +import static org.neo4j.driver.testutil.TestUtil.verifyCommitTx; +import static org.neo4j.driver.testutil.TestUtil.verifyRollbackTx; +import static org.neo4j.driver.testutil.TestUtil.verifyRunAndPull; import java.util.Arrays; import java.util.Collections; diff --git a/driver/src/test/java/org/neo4j/driver/internal/async/InternalAsyncTransactionTest.java b/driver/src/test/java/org/neo4j/driver/internal/async/InternalAsyncTransactionTest.java index 56fbebb177..7baa011108 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/async/InternalAsyncTransactionTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/async/InternalAsyncTransactionTest.java @@ -31,15 +31,15 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.neo4j.driver.Values.parameters; -import static org.neo4j.driver.util.TestUtil.await; -import static org.neo4j.driver.util.TestUtil.connectionMock; -import static org.neo4j.driver.util.TestUtil.newSession; -import static org.neo4j.driver.util.TestUtil.setupFailingCommit; -import static org.neo4j.driver.util.TestUtil.setupFailingRollback; -import static org.neo4j.driver.util.TestUtil.setupSuccessfulRunAndPull; -import static org.neo4j.driver.util.TestUtil.verifyCommitTx; -import static org.neo4j.driver.util.TestUtil.verifyRollbackTx; -import static org.neo4j.driver.util.TestUtil.verifyRunAndPull; +import static org.neo4j.driver.testutil.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.connectionMock; +import static org.neo4j.driver.testutil.TestUtil.newSession; +import static org.neo4j.driver.testutil.TestUtil.setupFailingCommit; +import static org.neo4j.driver.testutil.TestUtil.setupFailingRollback; +import static org.neo4j.driver.testutil.TestUtil.setupSuccessfulRunAndPull; +import static org.neo4j.driver.testutil.TestUtil.verifyCommitTx; +import static org.neo4j.driver.testutil.TestUtil.verifyRollbackTx; +import static org.neo4j.driver.testutil.TestUtil.verifyRunAndPull; import java.util.concurrent.CompletionStage; import java.util.concurrent.ExecutionException; diff --git a/driver/src/test/java/org/neo4j/driver/internal/async/LeakLoggingNetworkSessionTest.java b/driver/src/test/java/org/neo4j/driver/internal/async/LeakLoggingNetworkSessionTest.java index f116f7ffcf..f8eb4ca851 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/async/LeakLoggingNetworkSessionTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/async/LeakLoggingNetworkSessionTest.java @@ -30,7 +30,7 @@ import static org.mockito.Mockito.when; import static org.neo4j.driver.AccessMode.READ; import static org.neo4j.driver.internal.DatabaseNameUtil.defaultDatabase; -import static org.neo4j.driver.util.TestUtil.DEFAULT_TEST_PROTOCOL; +import static org.neo4j.driver.testutil.TestUtil.DEFAULT_TEST_PROTOCOL; import java.lang.reflect.Method; import org.junit.jupiter.api.Test; @@ -44,7 +44,7 @@ import org.neo4j.driver.internal.spi.Connection; import org.neo4j.driver.internal.spi.ConnectionProvider; import org.neo4j.driver.internal.util.FixedRetryLogic; -import org.neo4j.driver.util.TestUtil; +import org.neo4j.driver.testutil.TestUtil; class LeakLoggingNetworkSessionTest { @Test diff --git a/driver/src/test/java/org/neo4j/driver/internal/async/NetworkConnectionTest.java b/driver/src/test/java/org/neo4j/driver/internal/async/NetworkConnectionTest.java index 3ce7eb4dd7..3e0036cb45 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/async/NetworkConnectionTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/async/NetworkConnectionTest.java @@ -36,8 +36,8 @@ import static org.neo4j.driver.internal.messaging.request.PullAllMessage.PULL_ALL; import static org.neo4j.driver.internal.messaging.request.ResetMessage.RESET; import static org.neo4j.driver.internal.util.Iterables.single; -import static org.neo4j.driver.util.DaemonThreadFactory.daemon; -import static org.neo4j.driver.util.TestUtil.DEFAULT_TEST_PROTOCOL_VERSION; +import static org.neo4j.driver.testutil.DaemonThreadFactory.daemon; +import static org.neo4j.driver.testutil.TestUtil.DEFAULT_TEST_PROTOCOL_VERSION; import io.netty.channel.Channel; import io.netty.channel.DefaultEventLoop; diff --git a/driver/src/test/java/org/neo4j/driver/internal/async/NetworkSessionTest.java b/driver/src/test/java/org/neo4j/driver/internal/async/NetworkSessionTest.java index 7c5cab882c..cd2ba1f7cd 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/async/NetworkSessionTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/async/NetworkSessionTest.java @@ -40,16 +40,16 @@ import static org.neo4j.driver.AccessMode.READ; import static org.neo4j.driver.AccessMode.WRITE; import static org.neo4j.driver.internal.util.Futures.failedFuture; -import static org.neo4j.driver.util.TestUtil.await; -import static org.neo4j.driver.util.TestUtil.connectionMock; -import static org.neo4j.driver.util.TestUtil.newSession; -import static org.neo4j.driver.util.TestUtil.setupFailingBegin; -import static org.neo4j.driver.util.TestUtil.setupSuccessfulRunAndPull; -import static org.neo4j.driver.util.TestUtil.setupSuccessfulRunRx; -import static org.neo4j.driver.util.TestUtil.verifyBeginTx; -import static org.neo4j.driver.util.TestUtil.verifyRollbackTx; -import static org.neo4j.driver.util.TestUtil.verifyRunAndPull; -import static org.neo4j.driver.util.TestUtil.verifyRunRx; +import static org.neo4j.driver.testutil.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.connectionMock; +import static org.neo4j.driver.testutil.TestUtil.newSession; +import static org.neo4j.driver.testutil.TestUtil.setupFailingBegin; +import static org.neo4j.driver.testutil.TestUtil.setupSuccessfulRunAndPull; +import static org.neo4j.driver.testutil.TestUtil.setupSuccessfulRunRx; +import static org.neo4j.driver.testutil.TestUtil.verifyBeginTx; +import static org.neo4j.driver.testutil.TestUtil.verifyRollbackTx; +import static org.neo4j.driver.testutil.TestUtil.verifyRunAndPull; +import static org.neo4j.driver.testutil.TestUtil.verifyRunRx; import java.util.Collections; import java.util.Set; diff --git a/driver/src/test/java/org/neo4j/driver/internal/async/ResultCursorsHolderTest.java b/driver/src/test/java/org/neo4j/driver/internal/async/ResultCursorsHolderTest.java index 150074f227..cd640604a3 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/async/ResultCursorsHolderTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/async/ResultCursorsHolderTest.java @@ -26,7 +26,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.neo4j.driver.util.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.await; import java.io.IOException; import java.util.concurrent.CompletableFuture; diff --git a/driver/src/test/java/org/neo4j/driver/internal/async/UnmanagedTransactionTest.java b/driver/src/test/java/org/neo4j/driver/internal/async/UnmanagedTransactionTest.java index 7f6e012cfa..b586d7efe3 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/async/UnmanagedTransactionTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/async/UnmanagedTransactionTest.java @@ -39,16 +39,16 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.neo4j.driver.internal.handlers.pulln.FetchSizeUtil.UNLIMITED_FETCH_SIZE; -import static org.neo4j.driver.util.TestUtil.assertNoCircularReferences; -import static org.neo4j.driver.util.TestUtil.await; -import static org.neo4j.driver.util.TestUtil.beginMessage; -import static org.neo4j.driver.util.TestUtil.connectionMock; -import static org.neo4j.driver.util.TestUtil.setupSuccessfulRunAndPull; -import static org.neo4j.driver.util.TestUtil.setupSuccessfulRunRx; -import static org.neo4j.driver.util.TestUtil.verifyBeginTx; -import static org.neo4j.driver.util.TestUtil.verifyRollbackTx; -import static org.neo4j.driver.util.TestUtil.verifyRunAndPull; -import static org.neo4j.driver.util.TestUtil.verifyRunRx; +import static org.neo4j.driver.testutil.TestUtil.assertNoCircularReferences; +import static org.neo4j.driver.testutil.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.beginMessage; +import static org.neo4j.driver.testutil.TestUtil.connectionMock; +import static org.neo4j.driver.testutil.TestUtil.setupSuccessfulRunAndPull; +import static org.neo4j.driver.testutil.TestUtil.setupSuccessfulRunRx; +import static org.neo4j.driver.testutil.TestUtil.verifyBeginTx; +import static org.neo4j.driver.testutil.TestUtil.verifyRollbackTx; +import static org.neo4j.driver.testutil.TestUtil.verifyRunAndPull; +import static org.neo4j.driver.testutil.TestUtil.verifyRunRx; import java.util.Collections; import java.util.Set; diff --git a/driver/src/test/java/org/neo4j/driver/internal/async/connection/BoltProtocolUtilTest.java b/driver/src/test/java/org/neo4j/driver/internal/async/connection/BoltProtocolUtilTest.java index f6bb1c6746..a9dedc3676 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/async/connection/BoltProtocolUtilTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/async/connection/BoltProtocolUtilTest.java @@ -25,7 +25,7 @@ import static org.neo4j.driver.internal.async.connection.BoltProtocolUtil.writeChunkHeader; import static org.neo4j.driver.internal.async.connection.BoltProtocolUtil.writeEmptyChunkHeader; import static org.neo4j.driver.internal.async.connection.BoltProtocolUtil.writeMessageBoundary; -import static org.neo4j.driver.util.TestUtil.assertByteBufContains; +import static org.neo4j.driver.testutil.TestUtil.assertByteBufContains; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/driver/src/test/java/org/neo4j/driver/internal/async/connection/ChannelConnectedListenerTest.java b/driver/src/test/java/org/neo4j/driver/internal/async/connection/ChannelConnectedListenerTest.java index 7f35473b4a..1b090e1dca 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/async/connection/ChannelConnectedListenerTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/async/connection/ChannelConnectedListenerTest.java @@ -25,7 +25,7 @@ import static org.neo4j.driver.internal.BoltServerAddress.LOCAL_DEFAULT; import static org.neo4j.driver.internal.async.connection.BoltProtocolUtil.handshakeBuf; import static org.neo4j.driver.internal.logging.DevNullLogging.DEV_NULL_LOGGING; -import static org.neo4j.driver.util.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.await; import io.netty.channel.ChannelPromise; import io.netty.channel.embedded.EmbeddedChannel; diff --git a/driver/src/test/java/org/neo4j/driver/internal/async/connection/HandshakeCompletedListenerTest.java b/driver/src/test/java/org/neo4j/driver/internal/async/connection/HandshakeCompletedListenerTest.java index 369c18ed84..01775ec7cd 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/async/connection/HandshakeCompletedListenerTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/async/connection/HandshakeCompletedListenerTest.java @@ -26,7 +26,7 @@ import static org.mockito.Mockito.verify; import static org.neo4j.driver.internal.async.connection.ChannelAttributes.setMessageDispatcher; import static org.neo4j.driver.internal.async.connection.ChannelAttributes.setProtocolVersion; -import static org.neo4j.driver.util.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.await; import io.netty.channel.ChannelPromise; import io.netty.channel.embedded.EmbeddedChannel; diff --git a/driver/src/test/java/org/neo4j/driver/internal/async/connection/HandshakeHandlerTest.java b/driver/src/test/java/org/neo4j/driver/internal/async/connection/HandshakeHandlerTest.java index cf048f1b7b..e3ea065955 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/async/connection/HandshakeHandlerTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/async/connection/HandshakeHandlerTest.java @@ -30,7 +30,7 @@ import static org.neo4j.driver.internal.async.connection.BoltProtocolUtil.NO_PROTOCOL_VERSION; import static org.neo4j.driver.internal.async.connection.ChannelAttributes.setMessageDispatcher; import static org.neo4j.driver.internal.logging.DevNullLogging.DEV_NULL_LOGGING; -import static org.neo4j.driver.util.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.await; import io.netty.channel.ChannelPipeline; import io.netty.channel.ChannelPromise; diff --git a/driver/src/test/java/org/neo4j/driver/internal/async/connection/NettyChannelInitializerTest.java b/driver/src/test/java/org/neo4j/driver/internal/async/connection/NettyChannelInitializerTest.java index 4ca4ee2ab7..30bc28e3ed 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/async/connection/NettyChannelInitializerTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/async/connection/NettyChannelInitializerTest.java @@ -43,8 +43,8 @@ import javax.net.ssl.SSLParameters; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; +import org.neo4j.driver.RevocationStrategy; import org.neo4j.driver.internal.BoltServerAddress; -import org.neo4j.driver.internal.RevocationStrategy; import org.neo4j.driver.internal.security.SecurityPlan; import org.neo4j.driver.internal.security.SecurityPlanImpl; import org.neo4j.driver.internal.util.Clock; diff --git a/driver/src/test/java/org/neo4j/driver/internal/async/inbound/ChunkDecoderTest.java b/driver/src/test/java/org/neo4j/driver/internal/async/inbound/ChunkDecoderTest.java index 5d3a3c6a32..2b2f187286 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/async/inbound/ChunkDecoderTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/async/inbound/ChunkDecoderTest.java @@ -31,7 +31,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.neo4j.driver.internal.logging.DevNullLogging.DEV_NULL_LOGGING; -import static org.neo4j.driver.util.TestUtil.assertByteBufEquals; +import static org.neo4j.driver.testutil.TestUtil.assertByteBufEquals; import io.netty.buffer.ByteBuf; import io.netty.channel.embedded.EmbeddedChannel; diff --git a/driver/src/test/java/org/neo4j/driver/internal/async/inbound/MessageDecoderTest.java b/driver/src/test/java/org/neo4j/driver/internal/async/inbound/MessageDecoderTest.java index c8ec08ef74..9225030f7c 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/async/inbound/MessageDecoderTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/async/inbound/MessageDecoderTest.java @@ -22,7 +22,7 @@ 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.driver.util.TestUtil.assertByteBufEquals; +import static org.neo4j.driver.testutil.TestUtil.assertByteBufEquals; import io.netty.channel.embedded.EmbeddedChannel; import org.junit.jupiter.api.AfterEach; diff --git a/driver/src/test/java/org/neo4j/driver/internal/async/outbound/ChunkAwareByteBufOutputTest.java b/driver/src/test/java/org/neo4j/driver/internal/async/outbound/ChunkAwareByteBufOutputTest.java index 5382860941..836f7289b7 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/async/outbound/ChunkAwareByteBufOutputTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/async/outbound/ChunkAwareByteBufOutputTest.java @@ -20,7 +20,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.mock; -import static org.neo4j.driver.util.TestUtil.assertByteBufContains; +import static org.neo4j.driver.testutil.TestUtil.assertByteBufContains; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/driver/src/test/java/org/neo4j/driver/internal/async/outbound/OutboundMessageHandlerTest.java b/driver/src/test/java/org/neo4j/driver/internal/async/outbound/OutboundMessageHandlerTest.java index 278aca1468..a0e2ab8de9 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/async/outbound/OutboundMessageHandlerTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/async/outbound/OutboundMessageHandlerTest.java @@ -28,7 +28,7 @@ import static org.neo4j.driver.internal.logging.DevNullLogging.DEV_NULL_LOGGING; import static org.neo4j.driver.internal.messaging.MessageFormat.Writer; import static org.neo4j.driver.internal.messaging.request.PullAllMessage.PULL_ALL; -import static org.neo4j.driver.util.TestUtil.assertByteBufContains; +import static org.neo4j.driver.testutil.TestUtil.assertByteBufContains; import io.netty.buffer.ByteBuf; import io.netty.channel.embedded.EmbeddedChannel; diff --git a/driver/src/test/java/org/neo4j/driver/internal/async/pool/ConnectionPoolImplIT.java b/driver/src/test/java/org/neo4j/driver/internal/async/pool/ConnectionPoolImplIT.java index 16d3397c52..139781d742 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/async/pool/ConnectionPoolImplIT.java +++ b/driver/src/test/java/org/neo4j/driver/internal/async/pool/ConnectionPoolImplIT.java @@ -27,7 +27,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.neo4j.driver.internal.logging.DevNullLogging.DEV_NULL_LOGGING; -import static org.neo4j.driver.util.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.await; import io.netty.bootstrap.Bootstrap; import java.util.Collections; @@ -48,8 +48,8 @@ import org.neo4j.driver.internal.security.SecurityPlanImpl; import org.neo4j.driver.internal.spi.Connection; import org.neo4j.driver.internal.util.FakeClock; -import org.neo4j.driver.util.DatabaseExtension; -import org.neo4j.driver.util.ParallelizableIT; +import org.neo4j.driver.testutil.DatabaseExtension; +import org.neo4j.driver.testutil.ParallelizableIT; @ParallelizableIT class ConnectionPoolImplIT { diff --git a/driver/src/test/java/org/neo4j/driver/internal/async/pool/NettyChannelHealthCheckerTest.java b/driver/src/test/java/org/neo4j/driver/internal/async/pool/NettyChannelHealthCheckerTest.java index 4c1855c20b..21c35851e8 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/async/pool/NettyChannelHealthCheckerTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/async/pool/NettyChannelHealthCheckerTest.java @@ -31,7 +31,7 @@ import static org.neo4j.driver.internal.async.pool.PoolSettings.NOT_CONFIGURED; import static org.neo4j.driver.internal.logging.DevNullLogging.DEV_NULL_LOGGING; import static org.neo4j.driver.internal.util.Iterables.single; -import static org.neo4j.driver.util.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.await; import io.netty.channel.Channel; import io.netty.channel.embedded.EmbeddedChannel; diff --git a/driver/src/test/java/org/neo4j/driver/internal/async/pool/NettyChannelPoolIT.java b/driver/src/test/java/org/neo4j/driver/internal/async/pool/NettyChannelPoolIT.java index c15022ffec..e9f66227a5 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/async/pool/NettyChannelPoolIT.java +++ b/driver/src/test/java/org/neo4j/driver/internal/async/pool/NettyChannelPoolIT.java @@ -28,7 +28,7 @@ import static org.mockito.Mockito.verify; import static org.neo4j.driver.Values.value; import static org.neo4j.driver.internal.logging.DevNullLogging.DEV_NULL_LOGGING; -import static org.neo4j.driver.util.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.await; import io.netty.bootstrap.Bootstrap; import io.netty.channel.Channel; @@ -54,8 +54,8 @@ import org.neo4j.driver.internal.security.SecurityPlanImpl; import org.neo4j.driver.internal.util.FakeClock; import org.neo4j.driver.internal.util.ImmediateSchedulingEventExecutor; -import org.neo4j.driver.util.DatabaseExtension; -import org.neo4j.driver.util.ParallelizableIT; +import org.neo4j.driver.testutil.DatabaseExtension; +import org.neo4j.driver.testutil.ParallelizableIT; @ParallelizableIT class NettyChannelPoolIT { diff --git a/driver/src/test/java/org/neo4j/driver/internal/cluster/AbstractRoutingProcedureRunnerTest.java b/driver/src/test/java/org/neo4j/driver/internal/cluster/AbstractRoutingProcedureRunnerTest.java index 2bd9409ee3..8a79de2771 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/cluster/AbstractRoutingProcedureRunnerTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/cluster/AbstractRoutingProcedureRunnerTest.java @@ -28,7 +28,7 @@ import static org.neo4j.driver.internal.DatabaseNameUtil.defaultDatabase; import static org.neo4j.driver.internal.util.Futures.completedWithNull; import static org.neo4j.driver.internal.util.Futures.failedFuture; -import static org.neo4j.driver.util.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.await; import java.util.Collections; import java.util.List; diff --git a/driver/src/test/java/org/neo4j/driver/internal/cluster/MultiDatabasesRoutingProcedureRunnerTest.java b/driver/src/test/java/org/neo4j/driver/internal/cluster/MultiDatabasesRoutingProcedureRunnerTest.java index de11e40f53..34ad146c0d 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/cluster/MultiDatabasesRoutingProcedureRunnerTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/cluster/MultiDatabasesRoutingProcedureRunnerTest.java @@ -33,7 +33,7 @@ import static org.neo4j.driver.internal.cluster.MultiDatabasesRoutingProcedureRunner.DATABASE_NAME; import static org.neo4j.driver.internal.cluster.MultiDatabasesRoutingProcedureRunner.MULTI_DB_GET_ROUTING_TABLE; import static org.neo4j.driver.internal.cluster.SingleDatabaseRoutingProcedureRunner.ROUTING_CONTEXT; -import static org.neo4j.driver.util.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.await; import java.net.URI; import java.util.Collections; diff --git a/driver/src/test/java/org/neo4j/driver/internal/cluster/RediscoveryTest.java b/driver/src/test/java/org/neo4j/driver/internal/cluster/RediscoveryTest.java index e2dc07fa57..003078fada 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/cluster/RediscoveryTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/cluster/RediscoveryTest.java @@ -42,8 +42,8 @@ import static org.neo4j.driver.internal.util.ClusterCompositionUtil.D; import static org.neo4j.driver.internal.util.ClusterCompositionUtil.E; import static org.neo4j.driver.internal.util.Futures.failedFuture; -import static org.neo4j.driver.util.TestUtil.asOrderedSet; -import static org.neo4j.driver.util.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.asOrderedSet; +import static org.neo4j.driver.testutil.TestUtil.await; import java.io.IOException; import java.net.InetAddress; diff --git a/driver/src/test/java/org/neo4j/driver/internal/cluster/RouteMessageRoutingProcedureRunnerTest.java b/driver/src/test/java/org/neo4j/driver/internal/cluster/RouteMessageRoutingProcedureRunnerTest.java index 7ec61aead3..65c0a37df3 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/cluster/RouteMessageRoutingProcedureRunnerTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/cluster/RouteMessageRoutingProcedureRunnerTest.java @@ -50,7 +50,7 @@ import org.neo4j.driver.internal.handlers.RouteMessageResponseHandler; import org.neo4j.driver.internal.messaging.request.RouteMessage; import org.neo4j.driver.internal.spi.Connection; -import org.neo4j.driver.util.TestUtil; +import org.neo4j.driver.testutil.TestUtil; class RouteMessageRoutingProcedureRunnerTest { diff --git a/driver/src/test/java/org/neo4j/driver/internal/cluster/RoutingProcedureClusterCompositionProviderTest.java b/driver/src/test/java/org/neo4j/driver/internal/cluster/RoutingProcedureClusterCompositionProviderTest.java index 1936dddb7c..3f57adc494 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/cluster/RoutingProcedureClusterCompositionProviderTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/cluster/RoutingProcedureClusterCompositionProviderTest.java @@ -33,7 +33,7 @@ import static org.neo4j.driver.internal.DatabaseNameUtil.defaultDatabase; import static org.neo4j.driver.internal.util.Futures.completedWithNull; import static org.neo4j.driver.internal.util.Futures.failedFuture; -import static org.neo4j.driver.util.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.await; import java.util.Collections; import java.util.HashMap; diff --git a/driver/src/test/java/org/neo4j/driver/internal/cluster/RoutingTableHandlerTest.java b/driver/src/test/java/org/neo4j/driver/internal/cluster/RoutingTableHandlerTest.java index e82eb58ae3..1de0071440 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/cluster/RoutingTableHandlerTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/cluster/RoutingTableHandlerTest.java @@ -46,8 +46,8 @@ import static org.neo4j.driver.internal.util.ClusterCompositionUtil.D; import static org.neo4j.driver.internal.util.ClusterCompositionUtil.E; import static org.neo4j.driver.internal.util.ClusterCompositionUtil.F; -import static org.neo4j.driver.util.TestUtil.asOrderedSet; -import static org.neo4j.driver.util.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.asOrderedSet; +import static org.neo4j.driver.testutil.TestUtil.await; import java.util.Collections; import java.util.HashSet; diff --git a/driver/src/test/java/org/neo4j/driver/internal/cluster/RoutingTableRegistryImplTest.java b/driver/src/test/java/org/neo4j/driver/internal/cluster/RoutingTableRegistryImplTest.java index e63c84bd52..9de9e79ece 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/cluster/RoutingTableRegistryImplTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/cluster/RoutingTableRegistryImplTest.java @@ -46,7 +46,7 @@ import static org.neo4j.driver.internal.util.ClusterCompositionUtil.D; import static org.neo4j.driver.internal.util.ClusterCompositionUtil.E; import static org.neo4j.driver.internal.util.ClusterCompositionUtil.F; -import static org.neo4j.driver.util.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.await; import java.util.Arrays; import java.util.Collections; diff --git a/driver/src/test/java/org/neo4j/driver/internal/cluster/SingleDatabaseRoutingProcedureRunnerTest.java b/driver/src/test/java/org/neo4j/driver/internal/cluster/SingleDatabaseRoutingProcedureRunnerTest.java index 7cdc834857..762891c50b 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/cluster/SingleDatabaseRoutingProcedureRunnerTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/cluster/SingleDatabaseRoutingProcedureRunnerTest.java @@ -32,7 +32,7 @@ import static org.neo4j.driver.internal.DatabaseNameUtil.defaultDatabase; import static org.neo4j.driver.internal.cluster.SingleDatabaseRoutingProcedureRunner.GET_ROUTING_TABLE; import static org.neo4j.driver.internal.cluster.SingleDatabaseRoutingProcedureRunner.ROUTING_CONTEXT; -import static org.neo4j.driver.util.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.await; import java.net.URI; import java.util.Collections; diff --git a/driver/src/test/java/org/neo4j/driver/internal/cluster/loadbalancing/LoadBalancerTest.java b/driver/src/test/java/org/neo4j/driver/internal/cluster/loadbalancing/LoadBalancerTest.java index 5f7f0e1ca2..bc247bfe6a 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/cluster/loadbalancing/LoadBalancerTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/cluster/loadbalancing/LoadBalancerTest.java @@ -50,8 +50,8 @@ import static org.neo4j.driver.internal.util.ClusterCompositionUtil.C; import static org.neo4j.driver.internal.util.ClusterCompositionUtil.D; import static org.neo4j.driver.internal.util.Futures.completedWithNull; -import static org.neo4j.driver.util.TestUtil.asOrderedSet; -import static org.neo4j.driver.util.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.asOrderedSet; +import static org.neo4j.driver.testutil.TestUtil.await; import io.netty.util.concurrent.GlobalEventExecutor; import java.util.Arrays; diff --git a/driver/src/test/java/org/neo4j/driver/internal/cluster/loadbalancing/RoutingTableAndConnectionPoolTest.java b/driver/src/test/java/org/neo4j/driver/internal/cluster/loadbalancing/RoutingTableAndConnectionPoolTest.java index e92746e689..2bdb8b4247 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/cluster/loadbalancing/RoutingTableAndConnectionPoolTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/cluster/loadbalancing/RoutingTableAndConnectionPoolTest.java @@ -32,7 +32,7 @@ import static org.neo4j.driver.internal.DatabaseNameUtil.database; import static org.neo4j.driver.internal.cluster.RediscoveryUtil.contextWithDatabase; import static org.neo4j.driver.internal.cluster.RoutingSettings.STALE_ROUTING_TABLE_PURGE_DELAY_MS; -import static org.neo4j.driver.util.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.await; import io.netty.bootstrap.Bootstrap; import io.netty.util.concurrent.GlobalEventExecutor; diff --git a/driver/src/test/java/org/neo4j/driver/internal/cursor/AsyncResultCursorOnlyFactoryTest.java b/driver/src/test/java/org/neo4j/driver/internal/cursor/AsyncResultCursorOnlyFactoryTest.java index 4090b48cad..8102814bce 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/cursor/AsyncResultCursorOnlyFactoryTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/cursor/AsyncResultCursorOnlyFactoryTest.java @@ -27,7 +27,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.neo4j.driver.internal.util.Futures.getNow; -import static org.neo4j.driver.util.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.await; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionException; diff --git a/driver/src/test/java/org/neo4j/driver/internal/cursor/DisposableAsyncResultCursorTest.java b/driver/src/test/java/org/neo4j/driver/internal/cursor/DisposableAsyncResultCursorTest.java index 81cae950ee..7a3107428c 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/cursor/DisposableAsyncResultCursorTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/cursor/DisposableAsyncResultCursorTest.java @@ -27,7 +27,7 @@ import static org.mockito.BDDMockito.then; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.neo4j.driver.util.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.await; import java.util.concurrent.CompletableFuture; import org.junit.jupiter.api.BeforeEach; diff --git a/driver/src/test/java/org/neo4j/driver/internal/cursor/ResultCursorFactoryImplTest.java b/driver/src/test/java/org/neo4j/driver/internal/cursor/ResultCursorFactoryImplTest.java index 95a8940b0c..d5d588147d 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/cursor/ResultCursorFactoryImplTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/cursor/ResultCursorFactoryImplTest.java @@ -27,7 +27,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.neo4j.driver.internal.util.Futures.getNow; -import static org.neo4j.driver.util.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.await; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; diff --git a/driver/src/test/java/org/neo4j/driver/internal/handlers/CommitTxResponseHandlerTest.java b/driver/src/test/java/org/neo4j/driver/internal/handlers/CommitTxResponseHandlerTest.java index c0bcde1421..34e4fc9198 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/handlers/CommitTxResponseHandlerTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/handlers/CommitTxResponseHandlerTest.java @@ -24,7 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.neo4j.driver.Values.value; -import static org.neo4j.driver.util.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.await; import java.util.concurrent.CompletableFuture; import org.junit.jupiter.api.Test; diff --git a/driver/src/test/java/org/neo4j/driver/internal/handlers/LegacyPullAllResponseHandlerTest.java b/driver/src/test/java/org/neo4j/driver/internal/handlers/LegacyPullAllResponseHandlerTest.java index c688d75902..a9e67d3e03 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/handlers/LegacyPullAllResponseHandlerTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/handlers/LegacyPullAllResponseHandlerTest.java @@ -32,7 +32,7 @@ import static org.mockito.Mockito.verify; import static org.neo4j.driver.Values.value; import static org.neo4j.driver.Values.values; -import static org.neo4j.driver.util.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.await; import java.util.List; import java.util.concurrent.CompletableFuture; diff --git a/driver/src/test/java/org/neo4j/driver/internal/handlers/PullAllResponseHandlerTestBase.java b/driver/src/test/java/org/neo4j/driver/internal/handlers/PullAllResponseHandlerTestBase.java index f104e469c0..d869f7520a 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/handlers/PullAllResponseHandlerTestBase.java +++ b/driver/src/test/java/org/neo4j/driver/internal/handlers/PullAllResponseHandlerTestBase.java @@ -33,7 +33,7 @@ import static org.mockito.Mockito.when; import static org.neo4j.driver.Values.value; import static org.neo4j.driver.Values.values; -import static org.neo4j.driver.util.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.await; import java.io.IOException; import java.nio.channels.ClosedChannelException; diff --git a/driver/src/test/java/org/neo4j/driver/internal/handlers/RunResponseHandlerTest.java b/driver/src/test/java/org/neo4j/driver/internal/handlers/RunResponseHandlerTest.java index 9ee78ce6de..0b188a40e1 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/handlers/RunResponseHandlerTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/handlers/RunResponseHandlerTest.java @@ -36,7 +36,7 @@ import static org.mockito.Mockito.verify; import static org.neo4j.driver.Values.value; import static org.neo4j.driver.Values.values; -import static org.neo4j.driver.util.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.await; import java.util.HashMap; import java.util.List; diff --git a/driver/src/test/java/org/neo4j/driver/internal/messaging/v3/BoltProtocolV3Test.java b/driver/src/test/java/org/neo4j/driver/internal/messaging/v3/BoltProtocolV3Test.java index 6154976abb..c695185e58 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/messaging/v3/BoltProtocolV3Test.java +++ b/driver/src/test/java/org/neo4j/driver/internal/messaging/v3/BoltProtocolV3Test.java @@ -42,8 +42,8 @@ import static org.neo4j.driver.Values.value; import static org.neo4j.driver.internal.DatabaseNameUtil.defaultDatabase; import static org.neo4j.driver.internal.handlers.pulln.FetchSizeUtil.UNLIMITED_FETCH_SIZE; -import static org.neo4j.driver.util.TestUtil.await; -import static org.neo4j.driver.util.TestUtil.connectionMock; +import static org.neo4j.driver.testutil.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.connectionMock; import io.netty.channel.ChannelPromise; import io.netty.channel.embedded.EmbeddedChannel; diff --git a/driver/src/test/java/org/neo4j/driver/internal/messaging/v4/BoltProtocolV4Test.java b/driver/src/test/java/org/neo4j/driver/internal/messaging/v4/BoltProtocolV4Test.java index 382cf89d2f..b40ed9484e 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/messaging/v4/BoltProtocolV4Test.java +++ b/driver/src/test/java/org/neo4j/driver/internal/messaging/v4/BoltProtocolV4Test.java @@ -43,8 +43,8 @@ import static org.neo4j.driver.internal.DatabaseNameUtil.database; import static org.neo4j.driver.internal.DatabaseNameUtil.defaultDatabase; import static org.neo4j.driver.internal.handlers.pulln.FetchSizeUtil.UNLIMITED_FETCH_SIZE; -import static org.neo4j.driver.util.TestUtil.await; -import static org.neo4j.driver.util.TestUtil.connectionMock; +import static org.neo4j.driver.testutil.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.connectionMock; import io.netty.channel.ChannelPromise; import io.netty.channel.embedded.EmbeddedChannel; diff --git a/driver/src/test/java/org/neo4j/driver/internal/messaging/v41/BoltProtocolV41Test.java b/driver/src/test/java/org/neo4j/driver/internal/messaging/v41/BoltProtocolV41Test.java index a614d8b15c..2375335a11 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/messaging/v41/BoltProtocolV41Test.java +++ b/driver/src/test/java/org/neo4j/driver/internal/messaging/v41/BoltProtocolV41Test.java @@ -43,8 +43,8 @@ import static org.neo4j.driver.internal.DatabaseNameUtil.database; import static org.neo4j.driver.internal.DatabaseNameUtil.defaultDatabase; import static org.neo4j.driver.internal.handlers.pulln.FetchSizeUtil.UNLIMITED_FETCH_SIZE; -import static org.neo4j.driver.util.TestUtil.await; -import static org.neo4j.driver.util.TestUtil.connectionMock; +import static org.neo4j.driver.testutil.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.connectionMock; import io.netty.channel.ChannelPromise; import io.netty.channel.embedded.EmbeddedChannel; diff --git a/driver/src/test/java/org/neo4j/driver/internal/messaging/v42/BoltProtocolV42Test.java b/driver/src/test/java/org/neo4j/driver/internal/messaging/v42/BoltProtocolV42Test.java index 4637a1006d..34cfd2cee0 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/messaging/v42/BoltProtocolV42Test.java +++ b/driver/src/test/java/org/neo4j/driver/internal/messaging/v42/BoltProtocolV42Test.java @@ -43,8 +43,8 @@ import static org.neo4j.driver.internal.DatabaseNameUtil.database; import static org.neo4j.driver.internal.DatabaseNameUtil.defaultDatabase; import static org.neo4j.driver.internal.handlers.pulln.FetchSizeUtil.UNLIMITED_FETCH_SIZE; -import static org.neo4j.driver.util.TestUtil.await; -import static org.neo4j.driver.util.TestUtil.connectionMock; +import static org.neo4j.driver.testutil.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.connectionMock; import io.netty.channel.ChannelPromise; import io.netty.channel.embedded.EmbeddedChannel; diff --git a/driver/src/test/java/org/neo4j/driver/internal/messaging/v43/BoltProtocolV43Test.java b/driver/src/test/java/org/neo4j/driver/internal/messaging/v43/BoltProtocolV43Test.java index 4c721cce34..6cd1449924 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/messaging/v43/BoltProtocolV43Test.java +++ b/driver/src/test/java/org/neo4j/driver/internal/messaging/v43/BoltProtocolV43Test.java @@ -43,8 +43,8 @@ import static org.neo4j.driver.internal.DatabaseNameUtil.database; import static org.neo4j.driver.internal.DatabaseNameUtil.defaultDatabase; import static org.neo4j.driver.internal.handlers.pulln.FetchSizeUtil.UNLIMITED_FETCH_SIZE; -import static org.neo4j.driver.util.TestUtil.await; -import static org.neo4j.driver.util.TestUtil.connectionMock; +import static org.neo4j.driver.testutil.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.connectionMock; import io.netty.channel.ChannelPromise; import io.netty.channel.embedded.EmbeddedChannel; diff --git a/driver/src/test/java/org/neo4j/driver/internal/messaging/v44/BoltProtocolV44Test.java b/driver/src/test/java/org/neo4j/driver/internal/messaging/v44/BoltProtocolV44Test.java index 12fcb9f1ec..ef19163ac9 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/messaging/v44/BoltProtocolV44Test.java +++ b/driver/src/test/java/org/neo4j/driver/internal/messaging/v44/BoltProtocolV44Test.java @@ -43,8 +43,8 @@ import static org.neo4j.driver.internal.DatabaseNameUtil.database; import static org.neo4j.driver.internal.DatabaseNameUtil.defaultDatabase; import static org.neo4j.driver.internal.handlers.pulln.FetchSizeUtil.UNLIMITED_FETCH_SIZE; -import static org.neo4j.driver.util.TestUtil.await; -import static org.neo4j.driver.util.TestUtil.connectionMock; +import static org.neo4j.driver.testutil.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.connectionMock; import io.netty.channel.ChannelPromise; import io.netty.channel.embedded.EmbeddedChannel; diff --git a/driver/src/test/java/org/neo4j/driver/internal/messaging/v5/BoltProtocolV5Test.java b/driver/src/test/java/org/neo4j/driver/internal/messaging/v5/BoltProtocolV5Test.java index 564d38e6c5..bdd8143b81 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/messaging/v5/BoltProtocolV5Test.java +++ b/driver/src/test/java/org/neo4j/driver/internal/messaging/v5/BoltProtocolV5Test.java @@ -43,8 +43,8 @@ import static org.neo4j.driver.internal.DatabaseNameUtil.database; import static org.neo4j.driver.internal.DatabaseNameUtil.defaultDatabase; import static org.neo4j.driver.internal.handlers.pulln.FetchSizeUtil.UNLIMITED_FETCH_SIZE; -import static org.neo4j.driver.util.TestUtil.await; -import static org.neo4j.driver.util.TestUtil.connectionMock; +import static org.neo4j.driver.testutil.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.connectionMock; import io.netty.channel.ChannelPromise; import io.netty.channel.embedded.EmbeddedChannel; diff --git a/driver/src/test/java/org/neo4j/driver/internal/retry/ExponentialBackoffRetryLogicTest.java b/driver/src/test/java/org/neo4j/driver/internal/retry/ExponentialBackoffRetryLogicTest.java index 38a3861837..c1ef18454e 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/retry/ExponentialBackoffRetryLogicTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/retry/ExponentialBackoffRetryLogicTest.java @@ -45,7 +45,7 @@ import static org.mockito.Mockito.when; import static org.neo4j.driver.internal.logging.DevNullLogging.DEV_NULL_LOGGING; import static org.neo4j.driver.internal.util.Futures.failedFuture; -import static org.neo4j.driver.util.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.await; import java.util.ArrayList; import java.util.Arrays; diff --git a/driver/src/test/java/org/neo4j/driver/internal/util/FuturesTest.java b/driver/src/test/java/org/neo4j/driver/internal/util/FuturesTest.java index 01254def71..b611e3584a 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/util/FuturesTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/util/FuturesTest.java @@ -27,8 +27,8 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.neo4j.driver.internal.util.Matchers.blockingOperationInEventLoopError; -import static org.neo4j.driver.util.DaemonThreadFactory.daemon; -import static org.neo4j.driver.util.TestUtil.sleep; +import static org.neo4j.driver.testutil.DaemonThreadFactory.daemon; +import static org.neo4j.driver.testutil.TestUtil.sleep; import io.netty.channel.EventLoopGroup; import io.netty.util.concurrent.DefaultPromise; diff --git a/driver/src/test/java/org/neo4j/driver/internal/util/Neo4jWithFeatureCondition.java b/driver/src/test/java/org/neo4j/driver/internal/util/Neo4jWithFeatureCondition.java index cfcec2bd39..c63e1d6dd4 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/util/Neo4jWithFeatureCondition.java +++ b/driver/src/test/java/org/neo4j/driver/internal/util/Neo4jWithFeatureCondition.java @@ -30,7 +30,7 @@ import org.junit.jupiter.api.extension.ExtensionContext; import org.neo4j.driver.Driver; import org.neo4j.driver.Session; -import org.neo4j.driver.util.DatabaseExtension; +import org.neo4j.driver.testutil.DatabaseExtension; public class Neo4jWithFeatureCondition implements ExecutionCondition { private static final ConditionEvaluationResult ENABLED_NOT_ANNOTATED = diff --git a/driver/src/test/java/org/neo4j/driver/stress/AbstractStressTestBase.java b/driver/src/test/java/org/neo4j/driver/stress/AbstractStressTestBase.java index 6710b98199..c02827c868 100644 --- a/driver/src/test/java/org/neo4j/driver/stress/AbstractStressTestBase.java +++ b/driver/src/test/java/org/neo4j/driver/stress/AbstractStressTestBase.java @@ -88,9 +88,9 @@ import org.neo4j.driver.internal.util.Iterables; import org.neo4j.driver.reactive.RxSession; import org.neo4j.driver.reactive.RxTransaction; +import org.neo4j.driver.testutil.DaemonThreadFactory; import org.neo4j.driver.types.Node; import org.neo4j.driver.types.Point; -import org.neo4j.driver.util.DaemonThreadFactory; import org.reactivestreams.Publisher; import reactor.core.publisher.Flux; diff --git a/driver/src/test/java/org/neo4j/driver/stress/CausalClusteringStressIT.java b/driver/src/test/java/org/neo4j/driver/stress/CausalClusteringStressIT.java index e813413db1..08f1a99051 100644 --- a/driver/src/test/java/org/neo4j/driver/stress/CausalClusteringStressIT.java +++ b/driver/src/test/java/org/neo4j/driver/stress/CausalClusteringStressIT.java @@ -26,7 +26,7 @@ import org.neo4j.driver.AuthToken; import org.neo4j.driver.Config; import org.neo4j.driver.exceptions.SessionExpiredException; -import org.neo4j.driver.util.cc.LocalOrRemoteClusterExtension; +import org.neo4j.driver.testutil.cc.LocalOrRemoteClusterExtension; import org.testcontainers.junit.jupiter.Testcontainers; @Testcontainers(disabledWithoutDocker = true) diff --git a/driver/src/test/java/org/neo4j/driver/stress/SessionPoolingStressIT.java b/driver/src/test/java/org/neo4j/driver/stress/SessionPoolingStressIT.java index fe2efff7fe..1c644cc242 100644 --- a/driver/src/test/java/org/neo4j/driver/stress/SessionPoolingStressIT.java +++ b/driver/src/test/java/org/neo4j/driver/stress/SessionPoolingStressIT.java @@ -21,7 +21,7 @@ import static java.util.Arrays.asList; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.neo4j.driver.GraphDatabase.driver; -import static org.neo4j.driver.util.DaemonThreadFactory.daemon; +import static org.neo4j.driver.testutil.DaemonThreadFactory.daemon; import java.util.List; import java.util.Random; @@ -39,8 +39,8 @@ import org.neo4j.driver.Driver; import org.neo4j.driver.Result; import org.neo4j.driver.Session; -import org.neo4j.driver.util.DatabaseExtension; -import org.neo4j.driver.util.ParallelizableIT; +import org.neo4j.driver.testutil.DatabaseExtension; +import org.neo4j.driver.testutil.ParallelizableIT; @ParallelizableIT class SessionPoolingStressIT { diff --git a/driver/src/test/java/org/neo4j/driver/stress/SingleInstanceStressIT.java b/driver/src/test/java/org/neo4j/driver/stress/SingleInstanceStressIT.java index 81b77d862d..fd35912a95 100644 --- a/driver/src/test/java/org/neo4j/driver/stress/SingleInstanceStressIT.java +++ b/driver/src/test/java/org/neo4j/driver/stress/SingleInstanceStressIT.java @@ -24,8 +24,8 @@ import org.junit.jupiter.api.extension.RegisterExtension; import org.neo4j.driver.AuthToken; import org.neo4j.driver.Config; -import org.neo4j.driver.util.DatabaseExtension; -import org.neo4j.driver.util.ParallelizableIT; +import org.neo4j.driver.testutil.DatabaseExtension; +import org.neo4j.driver.testutil.ParallelizableIT; @ParallelizableIT class SingleInstanceStressIT extends AbstractStressTestBase { diff --git a/driver/src/test/java/org/neo4j/driver/util/CertificateUtil.java b/driver/src/test/java/org/neo4j/driver/testutil/CertificateUtil.java similarity index 98% rename from driver/src/test/java/org/neo4j/driver/util/CertificateUtil.java rename to driver/src/test/java/org/neo4j/driver/testutil/CertificateUtil.java index b84181c1c2..b12974a66e 100644 --- a/driver/src/test/java/org/neo4j/driver/util/CertificateUtil.java +++ b/driver/src/test/java/org/neo4j/driver/testutil/CertificateUtil.java @@ -16,10 +16,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.util; +package org.neo4j.driver.testutil; import static org.neo4j.driver.internal.util.CertificateTool.saveX509Cert; -import static org.neo4j.driver.util.FileTools.tempFile; +import static org.neo4j.driver.testutil.FileTools.tempFile; import java.io.File; import java.io.FileWriter; @@ -63,6 +63,7 @@ import org.bouncycastle.util.io.pem.PemObject; import org.bouncycastle.util.io.pem.PemWriter; import org.neo4j.driver.internal.InternalPair; +import org.neo4j.driver.util.Pair; public class CertificateUtil { private static final String DEFAULT_HOST_NAME = "localhost"; diff --git a/driver/src/test/java/org/neo4j/driver/util/CertificateUtilTest.java b/driver/src/test/java/org/neo4j/driver/testutil/CertificateUtilTest.java similarity index 87% rename from driver/src/test/java/org/neo4j/driver/util/CertificateUtilTest.java rename to driver/src/test/java/org/neo4j/driver/testutil/CertificateUtilTest.java index 14bfb9165d..75f3efbc29 100644 --- a/driver/src/test/java/org/neo4j/driver/util/CertificateUtilTest.java +++ b/driver/src/test/java/org/neo4j/driver/testutil/CertificateUtilTest.java @@ -16,12 +16,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.util; +package org.neo4j.driver.testutil; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.neo4j.driver.internal.util.CertificateTool.saveX509Cert; -import static org.neo4j.driver.util.CertificateUtil.generateSelfSignedCertificate; import java.io.File; import java.security.KeyStore; @@ -39,9 +38,9 @@ void shouldLoadMultipleCertsIntoKeyStore() throws Throwable { File certFile = File.createTempFile("3random", ".cer"); certFile.deleteOnExit(); - X509Certificate cert1 = generateSelfSignedCertificate(); - X509Certificate cert2 = generateSelfSignedCertificate(); - X509Certificate cert3 = generateSelfSignedCertificate(); + X509Certificate cert1 = CertificateUtil.generateSelfSignedCertificate(); + X509Certificate cert2 = CertificateUtil.generateSelfSignedCertificate(); + X509Certificate cert3 = CertificateUtil.generateSelfSignedCertificate(); saveX509Cert(new Certificate[] {cert1, cert2, cert3}, certFile); diff --git a/driver/src/test/java/org/neo4j/driver/util/DaemonThreadFactory.java b/driver/src/test/java/org/neo4j/driver/testutil/DaemonThreadFactory.java similarity index 97% rename from driver/src/test/java/org/neo4j/driver/util/DaemonThreadFactory.java rename to driver/src/test/java/org/neo4j/driver/testutil/DaemonThreadFactory.java index 41825a47fd..6804c6e6ed 100644 --- a/driver/src/test/java/org/neo4j/driver/util/DaemonThreadFactory.java +++ b/driver/src/test/java/org/neo4j/driver/testutil/DaemonThreadFactory.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.util; +package org.neo4j.driver.testutil; import static java.util.Objects.requireNonNull; diff --git a/driver/src/test/java/org/neo4j/driver/util/DatabaseExtension.java b/driver/src/test/java/org/neo4j/driver/testutil/DatabaseExtension.java similarity index 96% rename from driver/src/test/java/org/neo4j/driver/util/DatabaseExtension.java rename to driver/src/test/java/org/neo4j/driver/testutil/DatabaseExtension.java index 246eae6b8b..e269314d7b 100644 --- a/driver/src/test/java/org/neo4j/driver/util/DatabaseExtension.java +++ b/driver/src/test/java/org/neo4j/driver/testutil/DatabaseExtension.java @@ -16,14 +16,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.util; +package org.neo4j.driver.testutil; import static java.lang.Integer.parseInt; -import static org.neo4j.driver.util.Neo4jSettings.BOLT_TLS_LEVEL; -import static org.neo4j.driver.util.Neo4jSettings.BoltTlsLevel.OPTIONAL; -import static org.neo4j.driver.util.Neo4jSettings.BoltTlsLevel.REQUIRED; -import static org.neo4j.driver.util.Neo4jSettings.SSL_POLICY_BOLT_CLIENT_AUTH; -import static org.neo4j.driver.util.Neo4jSettings.SSL_POLICY_BOLT_ENABLED; +import static org.neo4j.driver.testutil.Neo4jSettings.BOLT_TLS_LEVEL; +import static org.neo4j.driver.testutil.Neo4jSettings.BoltTlsLevel.OPTIONAL; +import static org.neo4j.driver.testutil.Neo4jSettings.BoltTlsLevel.REQUIRED; +import static org.neo4j.driver.testutil.Neo4jSettings.SSL_POLICY_BOLT_CLIENT_AUTH; +import static org.neo4j.driver.testutil.Neo4jSettings.SSL_POLICY_BOLT_ENABLED; import java.io.File; import java.io.IOException; @@ -49,8 +49,8 @@ import org.neo4j.driver.GraphDatabase; import org.neo4j.driver.Session; import org.neo4j.driver.internal.BoltServerAddress; +import org.neo4j.driver.testutil.CertificateUtil.CertificateKeyPair; import org.neo4j.driver.types.TypeSystem; -import org.neo4j.driver.util.CertificateUtil.CertificateKeyPair; import org.testcontainers.DockerClientFactory; import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.Neo4jContainer; diff --git a/driver/src/test/java/org/neo4j/driver/util/DriverExtension.java b/driver/src/test/java/org/neo4j/driver/testutil/DriverExtension.java similarity index 95% rename from driver/src/test/java/org/neo4j/driver/util/DriverExtension.java rename to driver/src/test/java/org/neo4j/driver/testutil/DriverExtension.java index c541b36375..1e7d3b7853 100644 --- a/driver/src/test/java/org/neo4j/driver/util/DriverExtension.java +++ b/driver/src/test/java/org/neo4j/driver/testutil/DriverExtension.java @@ -16,9 +16,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.util; +package org.neo4j.driver.testutil; -import static org.neo4j.driver.util.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.await; import org.junit.jupiter.api.extension.AfterEachCallback; import org.junit.jupiter.api.extension.BeforeEachCallback; diff --git a/driver/src/test/java/org/neo4j/driver/util/FileTools.java b/driver/src/test/java/org/neo4j/driver/testutil/FileTools.java similarity index 99% rename from driver/src/test/java/org/neo4j/driver/util/FileTools.java rename to driver/src/test/java/org/neo4j/driver/testutil/FileTools.java index d6162129bd..334d3b3fa6 100644 --- a/driver/src/test/java/org/neo4j/driver/util/FileTools.java +++ b/driver/src/test/java/org/neo4j/driver/testutil/FileTools.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.util; +package org.neo4j.driver.testutil; import static java.io.File.createTempFile; diff --git a/driver/src/test/java/org/neo4j/driver/util/FileToolsTest.java b/driver/src/test/java/org/neo4j/driver/testutil/FileToolsTest.java similarity index 98% rename from driver/src/test/java/org/neo4j/driver/util/FileToolsTest.java rename to driver/src/test/java/org/neo4j/driver/testutil/FileToolsTest.java index a855edf022..954adc9faf 100644 --- a/driver/src/test/java/org/neo4j/driver/util/FileToolsTest.java +++ b/driver/src/test/java/org/neo4j/driver/testutil/FileToolsTest.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.util; +package org.neo4j.driver.testutil; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.junit.MatcherAssert.assertThat; diff --git a/driver/src/test/java/org/neo4j/driver/util/Neo4jSettings.java b/driver/src/test/java/org/neo4j/driver/testutil/Neo4jSettings.java similarity index 99% rename from driver/src/test/java/org/neo4j/driver/util/Neo4jSettings.java rename to driver/src/test/java/org/neo4j/driver/testutil/Neo4jSettings.java index fcf7d063b4..40db95865a 100644 --- a/driver/src/test/java/org/neo4j/driver/util/Neo4jSettings.java +++ b/driver/src/test/java/org/neo4j/driver/testutil/Neo4jSettings.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.util; +package org.neo4j.driver.testutil; import static org.neo4j.driver.internal.util.Iterables.map; diff --git a/driver/src/test/java/org/neo4j/driver/util/ParallelizableIT.java b/driver/src/test/java/org/neo4j/driver/testutil/ParallelizableIT.java similarity index 97% rename from driver/src/test/java/org/neo4j/driver/util/ParallelizableIT.java rename to driver/src/test/java/org/neo4j/driver/testutil/ParallelizableIT.java index db2a5c76f4..0b356d7c59 100644 --- a/driver/src/test/java/org/neo4j/driver/util/ParallelizableIT.java +++ b/driver/src/test/java/org/neo4j/driver/testutil/ParallelizableIT.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.util; +package org.neo4j.driver.testutil; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/driver/src/test/java/org/neo4j/driver/util/SessionExtension.java b/driver/src/test/java/org/neo4j/driver/testutil/SessionExtension.java similarity index 99% rename from driver/src/test/java/org/neo4j/driver/util/SessionExtension.java rename to driver/src/test/java/org/neo4j/driver/testutil/SessionExtension.java index 5b6aef62ef..be9322073c 100644 --- a/driver/src/test/java/org/neo4j/driver/util/SessionExtension.java +++ b/driver/src/test/java/org/neo4j/driver/testutil/SessionExtension.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.util; +package org.neo4j.driver.testutil; import java.util.Collections; import java.util.HashSet; diff --git a/driver/src/test/java/org/neo4j/driver/util/StdIOCapture.java b/driver/src/test/java/org/neo4j/driver/testutil/StdIOCapture.java similarity index 98% rename from driver/src/test/java/org/neo4j/driver/util/StdIOCapture.java rename to driver/src/test/java/org/neo4j/driver/testutil/StdIOCapture.java index 0184ecf7c4..815683fc9e 100644 --- a/driver/src/test/java/org/neo4j/driver/util/StdIOCapture.java +++ b/driver/src/test/java/org/neo4j/driver/testutil/StdIOCapture.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.util; +package org.neo4j.driver.testutil; import static java.util.Arrays.asList; diff --git a/driver/src/test/java/org/neo4j/driver/util/TemporalUtil.java b/driver/src/test/java/org/neo4j/driver/testutil/TemporalUtil.java similarity index 99% rename from driver/src/test/java/org/neo4j/driver/util/TemporalUtil.java rename to driver/src/test/java/org/neo4j/driver/testutil/TemporalUtil.java index 66879be944..887d7a7e30 100644 --- a/driver/src/test/java/org/neo4j/driver/util/TemporalUtil.java +++ b/driver/src/test/java/org/neo4j/driver/testutil/TemporalUtil.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.util; +package org.neo4j.driver.testutil; import static java.time.temporal.ChronoField.DAY_OF_MONTH; import static java.time.temporal.ChronoField.HOUR_OF_DAY; diff --git a/driver/src/test/java/org/neo4j/driver/util/TestUtil.java b/driver/src/test/java/org/neo4j/driver/testutil/TestUtil.java similarity index 99% rename from driver/src/test/java/org/neo4j/driver/util/TestUtil.java rename to driver/src/test/java/org/neo4j/driver/testutil/TestUtil.java index b33d96adb0..ce52b4b1cd 100644 --- a/driver/src/test/java/org/neo4j/driver/util/TestUtil.java +++ b/driver/src/test/java/org/neo4j/driver/testutil/TestUtil.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.util; +package org.neo4j.driver.testutil; import static java.util.Collections.emptyMap; import static java.util.concurrent.TimeUnit.MILLISECONDS; diff --git a/driver/src/test/java/org/neo4j/driver/util/cc/LocalOrRemoteClusterExtension.java b/driver/src/test/java/org/neo4j/driver/testutil/cc/LocalOrRemoteClusterExtension.java similarity index 98% rename from driver/src/test/java/org/neo4j/driver/util/cc/LocalOrRemoteClusterExtension.java rename to driver/src/test/java/org/neo4j/driver/testutil/cc/LocalOrRemoteClusterExtension.java index 6c8623691a..2d81008ab9 100644 --- a/driver/src/test/java/org/neo4j/driver/util/cc/LocalOrRemoteClusterExtension.java +++ b/driver/src/test/java/org/neo4j/driver/testutil/cc/LocalOrRemoteClusterExtension.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.util.cc; +package org.neo4j.driver.testutil.cc; import java.net.URI; import java.util.Optional; @@ -29,7 +29,7 @@ import org.neo4j.driver.Config; import org.neo4j.driver.Driver; import org.neo4j.driver.GraphDatabase; -import org.neo4j.driver.util.TestUtil; +import org.neo4j.driver.testutil.TestUtil; import org.testcontainers.containers.Neo4jContainer; public class LocalOrRemoteClusterExtension implements BeforeAllCallback, AfterEachCallback, AfterAllCallback { diff --git a/examples/src/test/java/org/neo4j/docs/driver/ExamplesIT.java b/examples/src/test/java/org/neo4j/docs/driver/ExamplesIT.java index 1bbef30d5b..76880239c6 100644 --- a/examples/src/test/java/org/neo4j/docs/driver/ExamplesIT.java +++ b/examples/src/test/java/org/neo4j/docs/driver/ExamplesIT.java @@ -36,9 +36,9 @@ import static org.neo4j.driver.Values.parameters; import static org.neo4j.driver.internal.util.Neo4jEdition.ENTERPRISE; import static org.neo4j.driver.internal.util.Neo4jFeature.BOLT_V4; -import static org.neo4j.driver.util.TestUtil.await; -import static org.neo4j.driver.util.TestUtil.createDatabase; -import static org.neo4j.driver.util.TestUtil.dropDatabase; +import static org.neo4j.driver.testutil.TestUtil.await; +import static org.neo4j.driver.testutil.TestUtil.createDatabase; +import static org.neo4j.driver.testutil.TestUtil.dropDatabase; import java.nio.file.Files; import java.nio.file.Path; @@ -60,10 +60,10 @@ import org.neo4j.driver.internal.util.EnabledOnNeo4jWith; import org.neo4j.driver.summary.QueryType; import org.neo4j.driver.summary.ResultSummary; -import org.neo4j.driver.util.DatabaseExtension; -import org.neo4j.driver.util.ParallelizableIT; -import org.neo4j.driver.util.StdIOCapture; -import org.neo4j.driver.util.TestUtil; +import org.neo4j.driver.testutil.DatabaseExtension; +import org.neo4j.driver.testutil.ParallelizableIT; +import org.neo4j.driver.testutil.StdIOCapture; +import org.neo4j.driver.testutil.TestUtil; @ParallelizableIT class ExamplesIT { diff --git a/pom.xml b/pom.xml index f775cac913..b2a62379c4 100644 --- a/pom.xml +++ b/pom.xml @@ -15,9 +15,8 @@ UTF-8 UTF-8 - 17 - 17 17 + 'v'yyyyMMdd-HHmm ${project.groupId}.${project.artifactId} @@ -26,7 +25,9 @@ 2 parallelizableIT - 3.0.0-M6 + 3.0.0-M7 + + true @@ -51,7 +52,7 @@ 1.2.11 2.13.3 1.18.24 - 21.3.2.1 + 22.2.0 1.9.1 1.17.3 4.4.9 @@ -265,6 +266,74 @@ + + org.apache.maven.plugins + maven-compiler-plugin + 3.10.1 + + true + true + + -Xlint:all${maven.compiler.xlint.extras} + -Werror + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${surefire.and.failsafe.version} + + ${surefire.jpms.args} + false + + org.graalvm.nativeimage:svm + + + + + org.apache.maven.plugins + maven-failsafe-plugin + ${surefire.and.failsafe.version} + + + org.graalvm.nativeimage:svm + + + + + + parallelizable-integration-tests + + integration-test + verify + + + -Dfile.encoding=${project.build.sourceEncoding} -DtestJvmId=${surefire.forkNumber} ${failsafe.parallelizable.jpms.args} + false + ${parallelizable.it.forkCount} + true + ${parallelizable.it.tags} + + + + + + sequential-integration-tests + + integration-test + verify + + + -Dfile.encoding=${project.build.sourceEncoding} + false + 1 + true + ${parallelizable.it.tags} + + + + org.codehaus.mojo clirr-maven-plugin @@ -483,6 +552,54 @@ maven-resources-plugin 2.7 + + org.apache.maven.plugins + maven-javadoc-plugin + 3.4.0 + + UTF-8 + UTF-8 + UTF-8 + + + + ]]> + + + if (typeof useModuleDirectories !== 'undefined') { + useModuleDirectories = false; + } + + ]]> + + + + + + + org/neo4j/driver/**/*.java + + org.neo4j.driver.internal + ${rootDir}/build/javadoc/overview.html + + + + attach-javadocs + + jar + + + + aggregate + + aggregate + + site + + + @@ -495,19 +612,6 @@ org.neo4j.build.plugins licensing-maven-plugin - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.0 - - true - true - - -Xlint:all - -Werror - - - org.apache.maven.plugins maven-source-plugin @@ -521,99 +625,6 @@ - - org.apache.maven.plugins - maven-javadoc-plugin - 3.0.1 - - UTF-8 - UTF-8 - UTF-8 - - - - ]]> - - - if (typeof useModuleDirectories !== 'undefined') { - useModuleDirectories = false; - } - - ]]> - - - --allow-script-in-comments - - org/neo4j/driver/**/*.java - - org.neo4j.driver.internal - ${rootDir}/build/javadoc/overview.html - - - - attach-javadocs - - jar - - - - aggregate - - aggregate - - site - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${surefire.and.failsafe.version} - - ${surefire.and.failsafe.argLine} - false - - - - org.apache.maven.plugins - maven-failsafe-plugin - ${surefire.and.failsafe.version} - - - - parallelizable-integration-tests - - integration-test - verify - - - -Dfile.encoding=${project.build.sourceEncoding} -DtestJvmId=${surefire.forkNumber} - false - ${parallelizable.it.forkCount} - true - ${parallelizable.it.tags} - - - - - - sequential-integration-tests - - integration-test - verify - - - -Dfile.encoding=${project.build.sourceEncoding} - false - 1 - true - ${parallelizable.it.tags} - - - - org.apache.maven.plugins diff --git a/testkit-backend/pom.xml b/testkit-backend/pom.xml index d7fb8f9ae2..0d7cf5c950 100644 --- a/testkit-backend/pom.xml +++ b/testkit-backend/pom.xml @@ -17,6 +17,7 @@ ${project.basedir}/.. + ,-processing @@ -57,16 +58,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - - -Xlint:all,-processing - -Werror - - - org.apache.maven.plugins maven-shade-plugin
Allocated marker byte values.
MarkerBinaryTypeDescription
00..7F0xxxxxxx+TINY_INTInteger 0 to 127
80..8F1000xxxxTINY_STRING