newExcludes = new HashSet<>(excludes);
newExcludes.add(key);
diff --git a/driver/src/test/java/org/neo4j/driver/util/ProcessEnvConfigurator.java b/driver/src/test/java/org/neo4j/driver/util/ProcessEnvConfigurator.java
deleted file mode 100644
index 7c60e7e02c..0000000000
--- a/driver/src/test/java/org/neo4j/driver/util/ProcessEnvConfigurator.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * 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.
- */
-package org.neo4j.driver.util;
-
-public final class ProcessEnvConfigurator {
- /**
- * Name of environment variable used by the Neo4j database.
- */
- private static final String JAVA_HOME = "JAVA_HOME";
- /**
- * Name of environment variable to be used for the Neo4j database, defined by the build system.
- */
- private static final String NEO4J_JAVA = "NEO4J_JAVA";
- /**
- * Name of an optional environment variable containing file path to a local Neo4j package.
- * This package is used by boltkit instead of downloading a package with the specified Neo4j version.
- */
- private static final String BOLTKIT_LOCAL_PACKAGE = "NEOCTRL_LOCAL_PACKAGE";
-
- private ProcessEnvConfigurator() {}
-
- public static void configure(ProcessBuilder processBuilder) {
- processBuilder.environment().put(JAVA_HOME, determineJavaHome());
-
- String localPackage = determineLocalPackage();
- if (localPackage != null) {
- processBuilder.environment().put(BOLTKIT_LOCAL_PACKAGE, localPackage);
- }
- }
-
- /**
- * This driver is built to work with multiple java versions. Neo4j, however, works with a specific version of
- * Java. This allows specifying which Java version to use for Neo4j separately from which version to use for
- * the driver tests.
- *
- * This method determines which java home to use based on present environment variables.
- *
- * @return path to the java home.
- */
- private static String determineJavaHome() {
- return System.getenv().getOrDefault(NEO4J_JAVA, System.getProperties().getProperty("java.home"));
- }
-
- private static String determineLocalPackage() {
- String value = System.getenv().getOrDefault(BOLTKIT_LOCAL_PACKAGE, "").trim();
- return value.isEmpty() ? null : value;
- }
-}
diff --git a/driver/src/test/java/org/neo4j/driver/util/cc/CommandLineException.java b/driver/src/test/java/org/neo4j/driver/util/cc/CommandLineException.java
deleted file mode 100644
index d245aaaee0..0000000000
--- a/driver/src/test/java/org/neo4j/driver/util/cc/CommandLineException.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.
- */
-package org.neo4j.driver.util.cc;
-
-class CommandLineException extends RuntimeException {
- CommandLineException(String message) {
- super(message);
- }
-
- CommandLineException(String message, Throwable cause) {
- super(message, cause);
- }
-}
diff --git a/driver/src/test/java/org/neo4j/driver/util/cc/CommandLineUtil.java b/driver/src/test/java/org/neo4j/driver/util/cc/CommandLineUtil.java
deleted file mode 100644
index b6027238ad..0000000000
--- a/driver/src/test/java/org/neo4j/driver/util/cc/CommandLineUtil.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * 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.
- */
-package org.neo4j.driver.util.cc;
-
-import static java.lang.System.lineSeparator;
-import static java.util.Arrays.asList;
-import static java.util.concurrent.TimeUnit.MINUTES;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import org.neo4j.driver.util.DaemonThreadFactory;
-import org.neo4j.driver.util.ProcessEnvConfigurator;
-
-public class CommandLineUtil {
- private static final ExecutorService executor =
- Executors.newCachedThreadPool(new DaemonThreadFactory("command-line-thread-"));
-
- public static boolean boltKitAvailable() {
- try {
- executeCommand("neoctrl-cluster", "--help");
- return true;
- } catch (CommandLineException e) {
- return false;
- }
- }
-
- public static String executeCommand(List commands) {
- try {
- ProcessBuilder processBuilder = new ProcessBuilder().command(commands);
- ProcessEnvConfigurator.configure(processBuilder);
- return executeAndGetStdOut(processBuilder);
- } catch (IOException | CommandLineException e) {
- throw new CommandLineException("Error running command " + commands, e);
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt();
- throw new CommandLineException("Interrupted while waiting for command " + commands, e);
- }
- }
-
- public static String executeCommand(String... command) {
- return executeCommand(asList(command));
- }
-
- private static String executeAndGetStdOut(ProcessBuilder processBuilder) throws IOException, InterruptedException {
- Process process = processBuilder.start();
- Future stdOutFuture = read(process.getInputStream());
- Future stdErrFuture = read(process.getErrorStream());
- int exitCode = process.waitFor();
- String stdOut = get(stdOutFuture);
- String stdErr = get(stdErrFuture);
- if (exitCode != 0) {
- throw new CommandLineException("Non-zero exit code\nSTDOUT:\n" + stdOut + "\nSTDERR:\n" + stdErr);
- }
- return stdOut;
- }
-
- private static Future read(final InputStream input) {
- return executor.submit(new Callable() {
- @Override
- public String call() throws Exception {
- return readToString(input);
- }
- });
- }
-
- private static String readToString(InputStream input) {
- StringBuilder result = new StringBuilder();
- try (BufferedReader reader = new BufferedReader(new InputStreamReader(input))) {
- String line;
- while ((line = reader.readLine()) != null) {
- result.append(line).append(lineSeparator());
- }
- } catch (IOException e) {
- throw new CommandLineException("Unable to read from stream", e);
- }
- return result.toString();
- }
-
- private static T get(Future future) {
- try {
- return future.get(10, MINUTES);
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
-}
diff --git a/driver/src/test/resources/logback-test.xml b/driver/src/test/resources/logback-test.xml
new file mode 100644
index 0000000000..ea9a2a3fac
--- /dev/null
+++ b/driver/src/test/resources/logback-test.xml
@@ -0,0 +1,14 @@
+
+
+
+ %d{HH:mm:ss.SSS} [%thread] %-5level %logger - %msg%n
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/driver/src/test/resources/nginx.conf b/driver/src/test/resources/nginx.conf
new file mode 100644
index 0000000000..4b8694ed11
--- /dev/null
+++ b/driver/src/test/resources/nginx.conf
@@ -0,0 +1,30 @@
+user nginx;
+worker_processes auto;
+
+error_log /var/log/nginx/error.log notice;
+pid /var/run/nginx.pid;
+
+
+events {
+ worker_connections 1024;
+}
+
+stream {
+ server {
+ resolver 127.0.0.11 ipv6=off;
+
+ set $upstream neo4j:7687;
+
+ listen 7687;
+ proxy_pass $upstream;
+ }
+
+ server {
+ resolver 127.0.0.11 ipv6=off;
+
+ set $upstream neo4j:7474;
+
+ listen 7474;
+ proxy_pass $upstream;
+ }
+}
\ No newline at end of file
diff --git a/examples/pom.xml b/examples/pom.xml
index 0524e43b04..a3d5ace7cf 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -74,6 +74,10 @@
neo4j
test
+
+ org.bouncycastle
+ bcpkix-jdk15on
+
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 b92fce2084..e62d97a2da 100644
--- a/examples/src/test/java/org/neo4j/docs/driver/ExamplesIT.java
+++ b/examples/src/test/java/org/neo4j/docs/driver/ExamplesIT.java
@@ -36,8 +36,6 @@
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.Neo4jRunner.PASSWORD;
-import static org.neo4j.driver.util.Neo4jRunner.USER;
import static org.neo4j.driver.util.TestUtil.await;
import static org.neo4j.driver.util.TestUtil.createDatabase;
import static org.neo4j.driver.util.TestUtil.dropDatabase;
@@ -52,8 +50,6 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
-import org.junit.jupiter.api.parallel.Execution;
-import org.junit.jupiter.api.parallel.ExecutionMode;
import org.neo4j.driver.Config;
import org.neo4j.driver.Driver;
import org.neo4j.driver.Session;
@@ -70,8 +66,9 @@
import org.neo4j.driver.util.TestUtil;
@ParallelizableIT
-@Execution(ExecutionMode.CONCURRENT)
class ExamplesIT {
+ static final String USER = "neo4j";
+
@RegisterExtension
static final DatabaseExtension neo4j = new DatabaseExtension();
@@ -128,7 +125,8 @@ void setUp() {
@Test
void testShouldRunAutocommitTransactionExample() throws Exception {
// Given
- try (AutocommitTransactionExample example = new AutocommitTransactionExample(uri, USER, PASSWORD)) {
+ try (AutocommitTransactionExample example =
+ new AutocommitTransactionExample(uri, USER, neo4j.adminPassword())) {
// When
example.addPerson("Alice");
@@ -139,7 +137,8 @@ void testShouldRunAutocommitTransactionExample() throws Exception {
@Test
void testShouldRunAsyncAutocommitTransactionExample() throws Exception {
- try (AsyncAutocommitTransactionExample example = new AsyncAutocommitTransactionExample(uri, USER, PASSWORD)) {
+ try (AsyncAutocommitTransactionExample example =
+ new AsyncAutocommitTransactionExample(uri, USER, neo4j.adminPassword())) {
// create some 'Product' nodes
try (Session session = neo4j.driver().session()) {
session.run("UNWIND ['Tesseract', 'Orb', 'Eye of Agamotto'] AS item "
@@ -157,7 +156,7 @@ void testShouldAsyncRunResultConsumeExample() throws Exception {
// Given
write("CREATE (a:Person {name: 'Alice'})");
write("CREATE (a:Person {name: 'Bob'})");
- try (AsyncResultConsumeExample example = new AsyncResultConsumeExample(uri, USER, PASSWORD)) {
+ try (AsyncResultConsumeExample example = new AsyncResultConsumeExample(uri, USER, neo4j.adminPassword())) {
// When
List names = await(example.getPeople());
@@ -171,7 +170,8 @@ void testShouldAsyncRunMultipleTransactionExample() throws Exception {
// Given
write("CREATE (a:Person {name: 'Alice'})");
write("CREATE (a:Person {name: 'Bob'})");
- try (AsyncRunMultipleTransactionExample example = new AsyncRunMultipleTransactionExample(uri, USER, PASSWORD)) {
+ try (AsyncRunMultipleTransactionExample example =
+ new AsyncRunMultipleTransactionExample(uri, USER, neo4j.adminPassword())) {
// When
Integer nodesCreated = await(example.addEmployees("Acme"));
@@ -186,7 +186,7 @@ void testShouldAsyncRunMultipleTransactionExample() throws Exception {
@Test
void testShouldRunConfigConnectionPoolExample() throws Exception {
// Given
- try (ConfigConnectionPoolExample example = new ConfigConnectionPoolExample(uri, USER, PASSWORD)) {
+ try (ConfigConnectionPoolExample example = new ConfigConnectionPoolExample(uri, USER, neo4j.adminPassword())) {
// Then
assertTrue(example.canConnect());
}
@@ -195,7 +195,7 @@ void testShouldRunConfigConnectionPoolExample() throws Exception {
@Test
void testShouldRunBasicAuthExample() throws Exception {
// Given
- try (BasicAuthExample example = new BasicAuthExample(uri, USER, PASSWORD)) {
+ try (BasicAuthExample example = new BasicAuthExample(uri, USER, neo4j.adminPassword())) {
// Then
assertTrue(example.canConnect());
}
@@ -204,7 +204,8 @@ void testShouldRunBasicAuthExample() throws Exception {
@Test
void testShouldRunConfigConnectionTimeoutExample() throws Exception {
// Given
- try (ConfigConnectionTimeoutExample example = new ConfigConnectionTimeoutExample(uri, USER, PASSWORD)) {
+ try (ConfigConnectionTimeoutExample example =
+ new ConfigConnectionTimeoutExample(uri, USER, neo4j.adminPassword())) {
// Then
assertThat(example, instanceOf(ConfigConnectionTimeoutExample.class));
}
@@ -213,7 +214,7 @@ void testShouldRunConfigConnectionTimeoutExample() throws Exception {
@Test
void testShouldRunConfigMaxRetryTimeExample() throws Exception {
// Given
- try (ConfigMaxRetryTimeExample example = new ConfigMaxRetryTimeExample(uri, USER, PASSWORD)) {
+ try (ConfigMaxRetryTimeExample example = new ConfigMaxRetryTimeExample(uri, USER, neo4j.adminPassword())) {
// Then
assertThat(example, instanceOf(ConfigMaxRetryTimeExample.class));
}
@@ -222,7 +223,7 @@ void testShouldRunConfigMaxRetryTimeExample() throws Exception {
@Test
void testShouldRunConfigTrustExample() throws Exception {
// Given
- try (ConfigTrustExample example = new ConfigTrustExample(uri, USER, PASSWORD)) {
+ try (ConfigTrustExample example = new ConfigTrustExample(uri, USER, neo4j.adminPassword())) {
// Then
assertThat(example, instanceOf(ConfigTrustExample.class));
}
@@ -231,7 +232,7 @@ void testShouldRunConfigTrustExample() throws Exception {
@Test
void testShouldRunConfigUnencryptedExample() throws Exception {
// Given
- try (ConfigUnencryptedExample example = new ConfigUnencryptedExample(uri, USER, PASSWORD)) {
+ try (ConfigUnencryptedExample example = new ConfigUnencryptedExample(uri, USER, neo4j.adminPassword())) {
// Then
assertThat(example, instanceOf(ConfigUnencryptedExample.class));
}
@@ -240,7 +241,7 @@ void testShouldRunConfigUnencryptedExample() throws Exception {
@Test
void testShouldRunCypherErrorExample() throws Exception {
// Given
- try (CypherErrorExample example = new CypherErrorExample(uri, USER, PASSWORD)) {
+ try (CypherErrorExample example = new CypherErrorExample(uri, USER, neo4j.adminPassword())) {
// When & Then
StdIOCapture stdIO = new StdIOCapture();
try (AutoCloseable ignored = stdIO.capture()) {
@@ -255,7 +256,7 @@ void testShouldRunCypherErrorExample() throws Exception {
@Test
void testShouldRunDriverLifecycleExample() throws Exception {
// Given
- try (DriverLifecycleExample example = new DriverLifecycleExample(uri, USER, PASSWORD)) {
+ try (DriverLifecycleExample example = new DriverLifecycleExample(uri, USER, neo4j.adminPassword())) {
// Then
assertThat(example, instanceOf(DriverLifecycleExample.class));
}
@@ -264,7 +265,7 @@ void testShouldRunDriverLifecycleExample() throws Exception {
@Test
void testShouldRunHelloWorld() throws Exception {
// Given
- try (HelloWorldExample greeter = new HelloWorldExample(uri, USER, PASSWORD)) {
+ try (HelloWorldExample greeter = new HelloWorldExample(uri, USER, neo4j.adminPassword())) {
// When
StdIOCapture stdIO = new StdIOCapture();
@@ -285,7 +286,8 @@ void testShouldRunDriverIntroduction() throws Exception {
.withEncryption()
.withTrustStrategy(trustAllCertificates())
.build();
- try (DriverIntroductionExample intro = new DriverIntroductionExample(uri, USER, PASSWORD, config)) {
+ try (DriverIntroductionExample intro =
+ new DriverIntroductionExample(uri, USER, neo4j.adminPassword(), config)) {
// When
StdIOCapture stdIO = new StdIOCapture();
@@ -304,7 +306,7 @@ void testShouldRunDriverIntroduction() throws Exception {
@Test
void testShouldRunReadWriteTransactionExample() throws Exception {
// Given
- try (ReadWriteTransactionExample example = new ReadWriteTransactionExample(uri, USER, PASSWORD)) {
+ try (ReadWriteTransactionExample example = new ReadWriteTransactionExample(uri, USER, neo4j.adminPassword())) {
// When
long nodeID = example.addPerson("Alice");
@@ -318,7 +320,7 @@ void testShouldRunResultConsumeExample() throws Exception {
// Given
write("CREATE (a:Person {name: 'Alice'})");
write("CREATE (a:Person {name: 'Bob'})");
- try (ResultConsumeExample example = new ResultConsumeExample(uri, USER, PASSWORD)) {
+ try (ResultConsumeExample example = new ResultConsumeExample(uri, USER, neo4j.adminPassword())) {
// When
List names = example.getPeople();
@@ -332,7 +334,7 @@ void testShouldRunResultRetainExample() throws Exception {
// Given
write("CREATE (a:Person {name: 'Alice'})");
write("CREATE (a:Person {name: 'Bob'})");
- try (ResultRetainExample example = new ResultRetainExample(uri, USER, PASSWORD)) {
+ try (ResultRetainExample example = new ResultRetainExample(uri, USER, neo4j.adminPassword())) {
// When
example.addEmployees("Acme");
@@ -346,15 +348,15 @@ void testShouldRunResultRetainExample() throws Exception {
@Test
void testShouldRunServiceUnavailableExample() throws Exception {
// Given
- try (ServiceUnavailableExample example = new ServiceUnavailableExample(uri, USER, PASSWORD)) {
+ try (ServiceUnavailableExample example = new ServiceUnavailableExample(uri, USER, neo4j.adminPassword())) {
try {
// When
- neo4j.stopDb();
+ neo4j.stopProxy();
// Then
assertThat(example.addItem(), equalTo(false));
} finally {
- neo4j.startDb();
+ neo4j.startProxy();
}
}
}
@@ -362,7 +364,7 @@ void testShouldRunServiceUnavailableExample() throws Exception {
@Test
void testShouldRunSessionExample() throws Exception {
// Given
- try (SessionExample example = new SessionExample(uri, USER, PASSWORD)) {
+ try (SessionExample example = new SessionExample(uri, USER, neo4j.adminPassword())) {
// When
example.addPerson("Alice");
@@ -375,7 +377,7 @@ void testShouldRunSessionExample() throws Exception {
@Test
void testShouldRunTransactionFunctionExample() throws Exception {
// Given
- try (TransactionFunctionExample example = new TransactionFunctionExample(uri, USER, PASSWORD)) {
+ try (TransactionFunctionExample example = new TransactionFunctionExample(uri, USER, neo4j.adminPassword())) {
// When
example.addPerson("Alice");
@@ -387,7 +389,8 @@ void testShouldRunTransactionFunctionExample() throws Exception {
@Test
void testShouldConfigureTransactionTimeoutExample() throws Exception {
// Given
- try (TransactionTimeoutConfigExample example = new TransactionTimeoutConfigExample(uri, USER, PASSWORD)) {
+ try (TransactionTimeoutConfigExample example =
+ new TransactionTimeoutConfigExample(uri, USER, neo4j.adminPassword())) {
// When
example.addPerson("Alice");
@@ -399,7 +402,8 @@ void testShouldConfigureTransactionTimeoutExample() throws Exception {
@Test
void testShouldConfigureTransactionMetadataExample() throws Exception {
// Given
- try (TransactionMetadataConfigExample example = new TransactionMetadataConfigExample(uri, USER, PASSWORD)) {
+ try (TransactionMetadataConfigExample example =
+ new TransactionMetadataConfigExample(uri, USER, neo4j.adminPassword())) {
// When
example.addPerson("Alice");
@@ -410,7 +414,8 @@ void testShouldConfigureTransactionMetadataExample() throws Exception {
@Test
void testShouldRunAsyncTransactionFunctionExample() throws Exception {
- try (AsyncTransactionFunctionExample example = new AsyncTransactionFunctionExample(uri, USER, PASSWORD)) {
+ try (AsyncTransactionFunctionExample example =
+ new AsyncTransactionFunctionExample(uri, USER, neo4j.adminPassword())) {
// create some 'Product' nodes
try (Session session = neo4j.driver().session()) {
session.run(
@@ -432,7 +437,7 @@ void testShouldRunAsyncTransactionFunctionExample() throws Exception {
@Test
void testPassBookmarksExample() throws Exception {
- try (PassBookmarkExample example = new PassBookmarkExample(uri, USER, PASSWORD)) {
+ try (PassBookmarkExample example = new PassBookmarkExample(uri, USER, neo4j.adminPassword())) {
// When
example.addEmployAndMakeFriends();
@@ -458,7 +463,8 @@ void testPassBookmarksExample() throws Exception {
@Test
void testAsyncUnmanagedTransactionExample() throws Exception {
- try (AsyncUnmanagedTransactionExample example = new AsyncUnmanagedTransactionExample(uri, USER, PASSWORD)) {
+ try (AsyncUnmanagedTransactionExample example =
+ new AsyncUnmanagedTransactionExample(uri, USER, neo4j.adminPassword())) {
// create a 'Product' node
try (Session session = neo4j.driver().session()) {
session.run("CREATE (:Product {id: 0, title: 'Mind Gem'})");
@@ -491,7 +497,7 @@ void testSlf4jLogging() throws Exception {
assertThat(logFileContent, is(emptyString()));
String randomString = UUID.randomUUID().toString();
- try (Slf4jLoggingExample example = new Slf4jLoggingExample(uri, USER, PASSWORD)) {
+ try (Slf4jLoggingExample example = new Slf4jLoggingExample(uri, USER, neo4j.adminPassword())) {
Object result = example.runReturnQuery(randomString);
assertEquals(randomString, result);
}
@@ -505,7 +511,7 @@ void testSlf4jLogging() throws Exception {
@Test
void testHostnameVerificationExample() {
try (HostnameVerificationExample example =
- new HostnameVerificationExample(uri, USER, PASSWORD, neo4j.tlsCertFile())) {
+ new HostnameVerificationExample(uri, USER, neo4j.adminPassword(), neo4j.tlsCertFile())) {
assertTrue(example.canConnect());
}
}
@@ -513,7 +519,8 @@ void testHostnameVerificationExample() {
@Test
@EnabledOnNeo4jWith(BOLT_V4)
void testShouldRunRxAutocommitTransactionExample() throws Exception {
- try (RxAutocommitTransactionExample example = new RxAutocommitTransactionExample(uri, USER, PASSWORD)) {
+ try (RxAutocommitTransactionExample example =
+ new RxAutocommitTransactionExample(uri, USER, neo4j.adminPassword())) {
// create some 'Product' nodes
try (Session session = neo4j.driver().session()) {
session.run("UNWIND ['Tesseract', 'Orb', 'Eye of Agamotto'] AS item "
@@ -532,7 +539,8 @@ void testShouldRunRxAutocommitTransactionExample() throws Exception {
@Test
@EnabledOnNeo4jWith(BOLT_V4)
void testRxUnmanagedTransactionExample() throws Exception {
- try (RxUnmanagedTransactionExample example = new RxUnmanagedTransactionExample(uri, USER, PASSWORD)) {
+ try (RxUnmanagedTransactionExample example =
+ new RxUnmanagedTransactionExample(uri, USER, neo4j.adminPassword())) {
// create a 'Product' node
try (Session session = neo4j.driver().session()) {
session.run("CREATE (:Product {id: 0, title: 'Mind Gem'})");
@@ -551,7 +559,8 @@ void testRxUnmanagedTransactionExample() throws Exception {
@Test
@EnabledOnNeo4jWith(BOLT_V4)
void testShouldRunRxTransactionFunctionExampleReactor() throws Exception {
- try (RxTransactionFunctionExample example = new RxTransactionFunctionExample(uri, USER, PASSWORD)) {
+ try (RxTransactionFunctionExample example =
+ new RxTransactionFunctionExample(uri, USER, neo4j.adminPassword())) {
// create some 'Product' nodes
try (Session session = neo4j.driver().session()) {
session.run(
@@ -576,7 +585,8 @@ void testShouldRunRxTransactionFunctionExampleReactor() throws Exception {
@Test
@EnabledOnNeo4jWith(BOLT_V4)
void testShouldRunRxTransactionFunctionExampleRxJava() throws Exception {
- try (RxTransactionFunctionExample example = new RxTransactionFunctionExample(uri, USER, PASSWORD)) {
+ try (RxTransactionFunctionExample example =
+ new RxTransactionFunctionExample(uri, USER, neo4j.adminPassword())) {
// create some 'Product' nodes
try (Session session = neo4j.driver().session()) {
session.run(
@@ -604,7 +614,7 @@ void testShouldRunRxResultConsumeExampleReactor() throws Exception {
// Given
write("CREATE (a:Person {name: 'Alice'})");
write("CREATE (a:Person {name: 'Bob'})");
- try (RxResultConsumeExample example = new RxResultConsumeExample(uri, USER, PASSWORD)) {
+ try (RxResultConsumeExample example = new RxResultConsumeExample(uri, USER, neo4j.adminPassword())) {
// When
List names = await(example.getPeople());
@@ -619,7 +629,7 @@ void testShouldRunRxResultConsumeExampleRxJava() throws Exception {
// Given
write("CREATE (a:Person {name: 'Alice'})");
write("CREATE (a:Person {name: 'Bob'})");
- try (RxResultConsumeExample example = new RxResultConsumeExample(uri, USER, PASSWORD)) {
+ try (RxResultConsumeExample example = new RxResultConsumeExample(uri, USER, neo4j.adminPassword())) {
// When
List names = await(example.getPeopleRxJava());
@@ -635,7 +645,7 @@ void testUseAnotherDatabaseExample() throws Exception {
dropDatabase(driver, "examples");
createDatabase(driver, "examples");
- try (DatabaseSelectionExample example = new DatabaseSelectionExample(uri, USER, PASSWORD)) {
+ try (DatabaseSelectionExample example = new DatabaseSelectionExample(uri, USER, neo4j.adminPassword())) {
// When
example.useAnotherDatabaseExample();
@@ -647,7 +657,7 @@ void testUseAnotherDatabaseExample() throws Exception {
@Test
void testReadingValuesExample() throws Exception {
- try (ReadingValuesExample example = new ReadingValuesExample(uri, USER, PASSWORD)) {
+ try (ReadingValuesExample example = new ReadingValuesExample(uri, USER, neo4j.adminPassword())) {
assertThat(example.integerFieldIsNull(), is(false));
assertThat(example.integerAsInteger(), is(4));
assertThat(example.integerAsLong(), is(4L));
diff --git a/pom.xml b/pom.xml
index ff1e65af96..5b95d462ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
${project.groupId}.${project.artifactId}
${project.basedir}
- 1C
+ 2
parallelizableIT
3.0.0-M6
diff --git a/testkit-tests/pom.xml b/testkit-tests/pom.xml
index 15b06fd824..f7a585911a 100644
--- a/testkit-tests/pom.xml
+++ b/testkit-tests/pom.xml
@@ -19,7 +19,7 @@
${project.basedir}/..
https://github.com/neo4j-drivers/testkit.git
- 4.4
+ 5.0
--tests TESTKIT_TESTS INTEGRATION_TESTS STUB_TESTS STRESS_TESTS TLS_TESTS
7200000
From 0f4a6a3da8793a0486d59dc3b15cea7f962f8379 Mon Sep 17 00:00:00 2001
From: Dmitriy Tverdiakov
Date: Tue, 22 Nov 2022 14:59:14 +0000
Subject: [PATCH 4/4] Skip tests incompatible with 5.x server
---
driver/pom.xml | 2 +
.../integration/ConnectionHandlingIT.java | 2 +
.../org/neo4j/driver/integration/ErrorIT.java | 34 +-
.../driver/integration/SessionBoltV3IT.java | 133 +-
.../neo4j/driver/integration/SessionIT.java | 4 +
.../driver/integration/SessionResetIT.java | 1322 ++++++++---------
.../neo4j/driver/integration/SummaryIT.java | 97 +-
.../integration/TransactionBoltV3IT.java | 58 +-
.../integration/async/AsyncSessionIT.java | 5 +-
.../integration/async/AsyncTransactionIT.java | 4 +
...RxResultRecordPublisherVerificationIT.java | 80 +-
.../neo4j/driver/util/DatabaseExtension.java | 4 -
pom.xml | 10 +-
testkit-tests/pom.xml | 2 +-
14 files changed, 821 insertions(+), 936 deletions(-)
diff --git a/driver/pom.xml b/driver/pom.xml
index 3f40a10e9a..17568c4d5b 100644
--- a/driver/pom.xml
+++ b/driver/pom.xml
@@ -103,10 +103,12 @@
org.reactivestreams
reactive-streams-tck
+ test
ch.qos.logback
logback-classic
+ test
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 ae3f48b72e..bafc392bd0 100644
--- a/driver/src/test/java/org/neo4j/driver/integration/ConnectionHandlingIT.java
+++ b/driver/src/test/java/org/neo4j/driver/integration/ConnectionHandlingIT.java
@@ -25,6 +25,7 @@
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
@@ -243,6 +244,7 @@ void connectionUsedForTransactionReturnedToThePoolWhenTransactionRolledBack() {
@Test
void connectionUsedForTransactionReturnedToThePoolWhenTransactionFailsToCommitted() {
+ assumeTrue(neo4j.isNeo4j44OrEarlier());
try (Session session = driver.session()) {
session.run("CREATE CONSTRAINT ON (book:Library) ASSERT exists(book.isbn)");
}
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 607c51e3ba..d134650d81 100644
--- a/driver/src/test/java/org/neo4j/driver/integration/ErrorIT.java
+++ b/driver/src/test/java/org/neo4j/driver/integration/ErrorIT.java
@@ -152,22 +152,24 @@ void shouldExplainConnectionError() {
@Test
void shouldHandleFailureAtRunTime() {
- String label = UUID.randomUUID().toString(); // avoid clashes with other tests
-
- // given
- Transaction tx = session.beginTransaction();
- tx.run("CREATE CONSTRAINT ON (a:`" + label + "`) ASSERT a.name IS UNIQUE");
- tx.commit();
-
- // and
- Transaction anotherTx = session.beginTransaction();
-
- // then expect
- ClientException e =
- assertThrows(ClientException.class, () -> anotherTx.run("CREATE INDEX ON :`" + label + "`(name)"));
- anotherTx.rollback();
- assertThat(e.getMessage(), containsString(label));
- assertThat(e.getMessage(), containsString("name"));
+ if (session.isNeo4j44OrEarlier()) {
+ String label = UUID.randomUUID().toString(); // avoid clashes with other tests
+
+ // given
+ Transaction tx = session.beginTransaction();
+ tx.run("CREATE CONSTRAINT ON (a:`" + label + "`) ASSERT a.name IS UNIQUE");
+ tx.commit();
+
+ // and
+ Transaction anotherTx = session.beginTransaction();
+
+ // then expect
+ ClientException e =
+ assertThrows(ClientException.class, () -> anotherTx.run("CREATE INDEX ON :`" + label + "`(name)"));
+ anotherTx.rollback();
+ assertThat(e.getMessage(), containsString(label));
+ assertThat(e.getMessage(), containsString("name"));
+ }
}
@Test
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 6388da523d..1541e7b02d 100644
--- a/driver/src/test/java/org/neo4j/driver/integration/SessionBoltV3IT.java
+++ b/driver/src/test/java/org/neo4j/driver/integration/SessionBoltV3IT.java
@@ -75,37 +75,42 @@ class SessionBoltV3IT {
@Test
void shouldSetTransactionMetadata() {
- Map metadata = new HashMap<>();
- metadata.put("a", "hello world");
- metadata.put("b", LocalDate.now());
- metadata.put("c", asList(true, false, true));
+ if (driver.isNeo4j44OrEarlier()) {
+ Map metadata = new HashMap<>();
+ metadata.put("a", "hello world");
+ metadata.put("b", LocalDate.now());
+ metadata.put("c", asList(true, false, true));
- TransactionConfig config =
- TransactionConfig.builder().withMetadata(metadata).build();
+ TransactionConfig config =
+ TransactionConfig.builder().withMetadata(metadata).build();
- // call listTransactions procedure that should list itself with the specified metadata
- Result result = driver.session().run("CALL dbms.listTransactions()", config);
- Map receivedMetadata = result.single().get("metaData").asMap();
+ // call listTransactions procedure that should list itself with the specified metadata
+ Result result = driver.session().run("CALL dbms.listTransactions()", config);
+ Map receivedMetadata =
+ result.single().get("metaData").asMap();
- assertEquals(metadata, receivedMetadata);
+ assertEquals(metadata, receivedMetadata);
+ }
}
@Test
void shouldSetTransactionMetadataAsync() {
- Map metadata = new HashMap<>();
- metadata.put("key1", "value1");
- metadata.put("key2", 42L);
+ if (driver.isNeo4j44OrEarlier()) {
+ Map metadata = new HashMap<>();
+ metadata.put("key1", "value1");
+ metadata.put("key2", 42L);
- TransactionConfig config =
- TransactionConfig.builder().withMetadata(metadata).build();
+ TransactionConfig config =
+ TransactionConfig.builder().withMetadata(metadata).build();
- // call listTransactions procedure that should list itself with the specified metadata
- CompletionStage> metadataFuture = driver.asyncSession()
- .runAsync("CALL dbms.listTransactions()", config)
- .thenCompose(ResultCursor::singleAsync)
- .thenApply(record -> record.get("metaData").asMap());
+ // call listTransactions procedure that should list itself with the specified metadata
+ CompletionStage> metadataFuture = driver.asyncSession()
+ .runAsync("CALL dbms.listTransactions()", config)
+ .thenCompose(ResultCursor::singleAsync)
+ .thenApply(record -> record.get("metaData").asMap());
- assertEquals(metadata, await(metadataFuture));
+ assertEquals(metadata, await(metadataFuture));
+ }
}
@Test
@@ -300,50 +305,54 @@ void shouldSendGoodbyeWhenClosingDriver() {
}
private static void testTransactionMetadataWithAsyncTransactionFunctions(boolean read) {
- AsyncSession asyncSession = driver.asyncSession();
- Map metadata = new HashMap<>();
- metadata.put("foo", "bar");
- metadata.put("baz", true);
- metadata.put("qux", 12345L);
-
- TransactionConfig config =
- TransactionConfig.builder().withMetadata(metadata).build();
-
- // call listTransactions procedure that should list itself with the specified metadata
- CompletionStage singleFuture = read
- ? asyncSession.readTransactionAsync(
- tx -> tx.runAsync("CALL dbms.listTransactions()").thenCompose(ResultCursor::singleAsync),
- config)
- : asyncSession.writeTransactionAsync(
- tx -> tx.runAsync("CALL dbms.listTransactions()").thenCompose(ResultCursor::singleAsync),
- config);
-
- CompletionStage> metadataFuture =
- singleFuture.thenApply(record -> record.get("metaData").asMap());
-
- assertEquals(metadata, await(metadataFuture));
+ if (driver.isNeo4j44OrEarlier()) {
+ AsyncSession asyncSession = driver.asyncSession();
+ Map metadata = new HashMap<>();
+ metadata.put("foo", "bar");
+ metadata.put("baz", true);
+ metadata.put("qux", 12345L);
+
+ TransactionConfig config =
+ TransactionConfig.builder().withMetadata(metadata).build();
+
+ // call listTransactions procedure that should list itself with the specified metadata
+ CompletionStage singleFuture = read
+ ? asyncSession.readTransactionAsync(
+ tx -> tx.runAsync("CALL dbms.listTransactions()").thenCompose(ResultCursor::singleAsync),
+ config)
+ : asyncSession.writeTransactionAsync(
+ tx -> tx.runAsync("CALL dbms.listTransactions()").thenCompose(ResultCursor::singleAsync),
+ config);
+
+ CompletionStage> metadataFuture =
+ singleFuture.thenApply(record -> record.get("metaData").asMap());
+
+ assertEquals(metadata, await(metadataFuture));
+ }
}
private static void testTransactionMetadataWithTransactionFunctions(boolean read) {
- Session session = driver.session();
- Map metadata = new HashMap<>();
- metadata.put("foo", "bar");
- metadata.put("baz", true);
- metadata.put("qux", 12345L);
-
- TransactionConfig config =
- TransactionConfig.builder().withMetadata(metadata).build();
-
- // call listTransactions procedure that should list itself with the specified metadata
- Record single = read
- ? session.readTransaction(
- tx -> tx.run("CALL dbms.listTransactions()").single(), config)
- : session.writeTransaction(
- tx -> tx.run("CALL dbms.listTransactions()").single(), config);
-
- Map receivedMetadata = single.get("metaData").asMap();
-
- assertEquals(metadata, receivedMetadata);
+ if (driver.isNeo4j44OrEarlier()) {
+ Session session = driver.session();
+ Map metadata = new HashMap<>();
+ metadata.put("foo", "bar");
+ metadata.put("baz", true);
+ metadata.put("qux", 12345L);
+
+ TransactionConfig config =
+ TransactionConfig.builder().withMetadata(metadata).build();
+
+ // call listTransactions procedure that should list itself with the specified metadata
+ Record single = read
+ ? session.readTransaction(
+ tx -> tx.run("CALL dbms.listTransactions()").single(), config)
+ : session.writeTransaction(
+ tx -> tx.run("CALL dbms.listTransactions()").single(), config);
+
+ Map receivedMetadata = single.get("metaData").asMap();
+
+ assertEquals(metadata, receivedMetadata);
+ }
}
private static void verifyValidException(Exception error) {
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 c894f655e5..6fc3507a08 100644
--- a/driver/src/test/java/org/neo4j/driver/integration/SessionIT.java
+++ b/driver/src/test/java/org/neo4j/driver/integration/SessionIT.java
@@ -35,6 +35,7 @@
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
@@ -677,6 +678,7 @@ public String execute(Transaction tx) {
@Test
void shouldThrowRunFailureImmediatelyAndCloseSuccessfully() {
+ assumeTrue(neo4j.isNeo4j44OrEarlier());
try (Session session = neo4j.driver().session()) {
ClientException e = assertThrows(ClientException.class, () -> session.run("RETURN 10 / 0"));
@@ -706,6 +708,7 @@ void shouldNotBePossibleToConsumeResultAfterSessionIsClosed() {
@Test
void shouldThrowRunFailureImmediatelyAfterMultipleSuccessfulRunsAndCloseSuccessfully() {
+ assumeTrue(neo4j.isNeo4j44OrEarlier());
try (Session session = neo4j.driver().session()) {
session.run("CREATE ()");
session.run("CREATE ()");
@@ -717,6 +720,7 @@ void shouldThrowRunFailureImmediatelyAfterMultipleSuccessfulRunsAndCloseSuccessf
@Test
void shouldThrowRunFailureImmediatelyAndAcceptSubsequentRun() {
+ assumeTrue(neo4j.isNeo4j44OrEarlier());
try (Session session = neo4j.driver().session()) {
session.run("CREATE ()");
session.run("CREATE ()");
diff --git a/driver/src/test/java/org/neo4j/driver/integration/SessionResetIT.java b/driver/src/test/java/org/neo4j/driver/integration/SessionResetIT.java
index df0727de5a..6ec4be26eb 100644
--- a/driver/src/test/java/org/neo4j/driver/integration/SessionResetIT.java
+++ b/driver/src/test/java/org/neo4j/driver/integration/SessionResetIT.java
@@ -16,733 +16,595 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-//package org.neo4j.driver.integration;
-//
-//import static java.util.Collections.newSetFromMap;
-//import static java.util.concurrent.CompletableFuture.runAsync;
-//import static java.util.concurrent.TimeUnit.MILLISECONDS;
-//import static java.util.concurrent.TimeUnit.MINUTES;
-//import static java.util.concurrent.TimeUnit.SECONDS;
-//import static java.util.stream.IntStream.range;
-//import static org.hamcrest.CoreMatchers.containsString;
-//import static org.hamcrest.CoreMatchers.equalTo;
-//import static org.hamcrest.CoreMatchers.startsWith;
-//import static org.hamcrest.Matchers.greaterThan;
-//import static org.hamcrest.Matchers.instanceOf;
-//import static org.hamcrest.Matchers.lessThanOrEqualTo;
-//import static org.hamcrest.junit.MatcherAssert.assertThat;
-//import static org.junit.jupiter.api.Assertions.assertEquals;
-//import static org.junit.jupiter.api.Assertions.assertNotNull;
-//import static org.junit.jupiter.api.Assertions.assertThrows;
-//import static org.junit.jupiter.api.Assertions.assertTrue;
-//import static org.neo4j.driver.Values.parameters;
-//import static org.neo4j.driver.util.DaemonThreadFactory.daemon;
-//import static org.neo4j.driver.util.Neo4jRunner.HOME_DIR;
-//import static org.neo4j.driver.util.Neo4jSettings.IMPORT_DIR;
-//import static org.neo4j.driver.util.Neo4jSettings.TEST_SETTINGS;
-//import static org.neo4j.driver.util.TestUtil.activeQueryCount;
-//import static org.neo4j.driver.util.TestUtil.activeQueryNames;
-//import static org.neo4j.driver.util.TestUtil.await;
-//import static org.neo4j.driver.util.TestUtil.awaitAllFutures;
-//import static org.neo4j.driver.util.TestUtil.awaitCondition;
-//
-//import java.io.IOException;
-//import java.io.UncheckedIOException;
-//import java.net.URI;
-//import java.nio.channels.ClosedChannelException;
-//import java.nio.file.Files;
-//import java.nio.file.Path;
-//import java.nio.file.Paths;
-//import java.util.ArrayList;
-//import java.util.List;
-//import java.util.Random;
-//import java.util.Set;
-//import java.util.concurrent.CompletableFuture;
-//import java.util.concurrent.ConcurrentHashMap;
-//import java.util.concurrent.CountDownLatch;
-//import java.util.concurrent.ExecutionException;
-//import java.util.concurrent.ExecutorService;
-//import java.util.concurrent.Executors;
-//import java.util.concurrent.Future;
-//import java.util.concurrent.ThreadLocalRandom;
-//import java.util.concurrent.TimeUnit;
-//import java.util.concurrent.atomic.AtomicBoolean;
-//import java.util.concurrent.atomic.AtomicInteger;
-//import java.util.concurrent.atomic.AtomicLong;
-//import java.util.concurrent.atomic.AtomicReference;
-//import org.hamcrest.CoreMatchers;
-//import org.hamcrest.MatcherAssert;
-//import org.junit.jupiter.api.AfterEach;
-//import org.junit.jupiter.api.BeforeEach;
-//import org.junit.jupiter.api.Test;
-//import org.junit.jupiter.api.extension.RegisterExtension;
-//import org.neo4j.driver.Driver;
-//import org.neo4j.driver.QueryRunner;
-//import org.neo4j.driver.Result;
-//import org.neo4j.driver.Session;
-//import org.neo4j.driver.Transaction;
-//import org.neo4j.driver.exceptions.ClientException;
-//import org.neo4j.driver.exceptions.Neo4jException;
-//import org.neo4j.driver.exceptions.ServiceUnavailableException;
-//import org.neo4j.driver.exceptions.TransientException;
-//import org.neo4j.driver.util.DatabaseExtension;
-//import org.neo4j.driver.util.ParallelizableIT;
-//
-//@SuppressWarnings("deprecation")
-//@ParallelizableIT
-//class SessionResetIT {
-// private static final int CSV_FILE_SIZE = 10_000;
-// private static final int LOAD_CSV_BATCH_SIZE = 10;
-//
-// private static final String SHORT_QUERY_1 = "CREATE (n:Node {name: 'foo', occupation: 'bar'})";
-// private static final String SHORT_QUERY_2 = "MATCH (n:Node {name: 'foo'}) RETURN count(n)";
-// private static final String LONG_QUERY = "UNWIND range(0, 10000000) AS i CREATE (n:Node {idx: i}) DELETE n";
-// private static final String LONG_PERIODIC_COMMIT_QUERY_TEMPLATE = "USING PERIODIC COMMIT 1 "
-// + "LOAD CSV FROM '%s' AS line "
-// + "UNWIND range(1, "
-// + LOAD_CSV_BATCH_SIZE + ") AS index " + "CREATE (n:Node {id: index, name: line[0], occupation: line[1]})";
-//
-// private static final int STRESS_TEST_THREAD_COUNT = Runtime.getRuntime().availableProcessors() * 2;
-// private static final long STRESS_TEST_DURATION_MS = SECONDS.toMillis(5);
-// private static final String[] STRESS_TEST_QUERIES = {SHORT_QUERY_1, SHORT_QUERY_2, LONG_QUERY};
-//
-// @RegisterExtension
-// static final DatabaseExtension neo4j = new DatabaseExtension();
-//
-// private ExecutorService executor;
-//
-// @BeforeEach
-// void setUp() {
-// executor = Executors.newCachedThreadPool(daemon(getClass().getSimpleName() + "-thread"));
-// }
-//
-// @AfterEach
-// void tearDown() {
-// if (executor != null) {
-// executor.shutdownNow();
-// }
-// }
-//
-// @Test
-// void shouldTerminateAutoCommitQuery() {
-// testQueryTermination(LONG_QUERY, true);
-// }
-//
-// @Test
-// void shouldTerminateQueryInUnmanagedTransaction() {
-// testQueryTermination(LONG_QUERY, false);
-// }
-//
-// /**
-// * It is currently unsafe to terminate periodic commit query because it'll then be half-committed.
-// * So the driver give no guarantee when the periodic commit could be terminated.
-// * For a user who want to terminate a periodic commit, he or she should use kill query by id.
-// */
-// @Test
-// void shouldTerminatePeriodicCommitQueryRandomly() {
-// Future queryResult = runQueryInDifferentThreadAndResetSession(longPeriodicCommitQuery(), true);
-//
-// ExecutionException e = assertThrows(ExecutionException.class, () -> queryResult.get(1, MINUTES));
-// assertThat(e.getCause(), instanceOf(Neo4jException.class));
-//
-// awaitNoActiveQueries();
-//
-// assertThat(countNodes(), lessThanOrEqualTo(((long) CSV_FILE_SIZE) * LOAD_CSV_BATCH_SIZE));
-// }
-//
-// @Test
-// void shouldTerminateAutoCommitQueriesRandomly() throws Exception {
-// testRandomQueryTermination(true);
-// }
-//
-// @Test
-// void shouldTerminateQueriesInUnmanagedTransactionsRandomly() throws Exception {
-// testRandomQueryTermination(false);
-// }
-//
-// @Test
-// void shouldRejectNewTransactionWhenOpenTransactionExistsAndShouldFailRunResultOnSessionReset() throws Throwable {
-// neo4j.ensureProcedures("longRunningStatement.jar");
-//
-// try (Session session = neo4j.driver().session()) {
-// Transaction tx1 = session.beginTransaction();
-//
-// CompletableFuture txRunFuture = CompletableFuture.runAsync(
-// () -> tx1.run("CALL test.driver.longRunningStatement({seconds})", parameters("seconds", 10)));
-//
-// awaitActiveQueriesToContain("CALL test.driver.longRunningStatement");
-// session.reset();
-//
-// ClientException e1 = assertThrows(ClientException.class, session::beginTransaction);
-// assertThat(
-// e1.getMessage(),
-// containsString("You cannot begin a transaction on a session with an open transaction"));
-//
-// ClientException e2 = assertThrows(ClientException.class, () -> tx1.run("RETURN 1"));
-// assertThat(e2.getMessage(), containsString("Cannot run more queries in this transaction"));
-//
-// // Make sure failure from the terminated long running query is propagated
-// Neo4jException e3 = assertThrows(Neo4jException.class, () -> await(txRunFuture));
-// assertThat(e3.getMessage(), containsString("The transaction has been terminated"));
-// }
-// }
-//
-// @Test
-// void shouldSuccessfullyCloseAfterSessionReset() throws Throwable {
-// neo4j.ensureProcedures("longRunningStatement.jar");
-//
-// try (Session session = neo4j.driver().session()) {
-// CompletableFuture.runAsync(
-// () -> session.run("CALL test.driver.longRunningStatement({seconds})", parameters("seconds", 10)));
-//
-// awaitActiveQueriesToContain("CALL test.driver.longRunningStatement");
-// session.reset();
-// }
-// }
-//
-// @Test
-// void shouldBeAbleToBeginNewTransactionAfterFirstTransactionInterruptedBySessionResetIsClosed() throws Throwable {
-// neo4j.ensureProcedures("longRunningStatement.jar");
-//
-// try (Session session = neo4j.driver().session()) {
-// Transaction tx1 = session.beginTransaction();
-//
-// CompletableFuture txRunFuture = runAsync(
-// () -> tx1.run("CALL test.driver.longRunningStatement({seconds})", parameters("seconds", 10)));
-//
-// awaitActiveQueriesToContain("CALL test.driver.longRunningStatement");
-// session.reset();
-//
-// Neo4jException e = assertThrows(Neo4jException.class, () -> await(txRunFuture));
-// assertThat(e.getMessage(), containsString("The transaction has been terminated"));
-// tx1.close();
-//
-// try (Transaction tx2 = session.beginTransaction()) {
-// tx2.run("CREATE (n:FirstNode)");
-// tx2.commit();
-// }
-//
-// Result result = session.run("MATCH (n) RETURN count(n)");
-// long nodes = result.single().get("count(n)").asLong();
-// MatcherAssert.assertThat(nodes, equalTo(1L));
-// }
-// }
-//
-// @Test
-// void shouldKillLongRunningQuery() throws Throwable {
-// neo4j.ensureProcedures("longRunningStatement.jar");
-//
-// final int executionTimeout = 10; // 10s
-// final int killTimeout = 1; // 1s
-// final AtomicLong startTime = new AtomicLong(-1);
-// long endTime;
-//
-// try (Session session = neo4j.driver().session()) {
-// CompletableFuture sessionRunFuture = CompletableFuture.runAsync(() -> {
-// // When
-// startTime.set(System.currentTimeMillis());
-// session.run(
-// "CALL test.driver.longRunningStatement({seconds})", parameters("seconds", executionTimeout));
-// });
-//
-// resetSessionAfterTimeout(session, killTimeout);
-//
-// assertThrows(Neo4jException.class, () -> await(sessionRunFuture));
-// }
-//
-// endTime = System.currentTimeMillis();
-// assertTrue(startTime.get() > 0);
-// assertTrue(endTime - startTime.get() > killTimeout * 1000); // get reset by session.reset
-// assertTrue(endTime - startTime.get() < executionTimeout * 1000 / 2); // finished before execution finished
-// }
-//
-// @Test
-// void shouldKillLongStreamingResult() throws Throwable {
-// neo4j.ensureProcedures("longRunningStatement.jar");
-// // Given
-// final int executionTimeout = 10; // 10s
-// final int killTimeout = 1; // 1s
-// final AtomicInteger recordCount = new AtomicInteger();
-// final AtomicLong startTime = new AtomicLong(-1);
-// long endTime;
-//
-// Neo4jException e = assertThrows(Neo4jException.class, () -> {
-// try (Session session = neo4j.driver().session()) {
-// Result result = session.run(
-// "CALL test.driver.longStreamingResult({seconds})", parameters("seconds", executionTimeout));
-//
-// resetSessionAfterTimeout(session, killTimeout);
-//
-// // When
-// startTime.set(System.currentTimeMillis());
-// while (result.hasNext()) {
-// result.next();
-// recordCount.incrementAndGet();
-// }
-// }
-// });
-//
-// endTime = System.currentTimeMillis();
-// assertThat(e.getMessage(), containsString("The transaction has been terminated"));
-// assertThat(recordCount.get(), greaterThan(1));
-//
-// assertTrue(startTime.get() > 0);
-// assertTrue(endTime - startTime.get() > killTimeout * 1000); // get reset by session.reset
-// assertTrue(endTime - startTime.get() < executionTimeout * 1000 / 2); // finished before execution finished
-// }
-//
-// private void resetSessionAfterTimeout(Session session, int timeout) {
-// executor.submit(() -> {
-// try {
-// Thread.sleep(timeout * 1000); // let the query execute for timeout seconds
-// } catch (InterruptedException ignore) {
-// } finally {
-// session.reset(); // reset the session after timeout
-// }
-// });
-// }
-//
-// @Test
-// void shouldAllowMoreQueriesAfterSessionReset() {
-// // Given
-// try (Session session = neo4j.driver().session()) {
-//
-// session.run("RETURN 1").consume();
-//
-// // When reset the state of this session
-// session.reset();
-//
-// // Then can run successfully more queries without any error
-// session.run("RETURN 2").consume();
-// }
-// }
-//
-// @Test
-// void shouldAllowMoreTxAfterSessionReset() {
-// // Given
-// try (Session session = neo4j.driver().session()) {
-// try (Transaction tx = session.beginTransaction()) {
-// tx.run("RETURN 1");
-// tx.commit();
-// }
-//
-// // When reset the state of this session
-// session.reset();
-//
-// // Then can run more Tx
-// try (Transaction tx = session.beginTransaction()) {
-// tx.run("RETURN 2");
-// tx.commit();
-// }
-// }
-// }
-//
-// @Test
-// void shouldMarkTxAsFailedAndDisallowRunAfterSessionReset() {
-// // Given
-// try (Session session = neo4j.driver().session()) {
-// Transaction tx = session.beginTransaction();
-// // When reset the state of this session
-// session.reset();
-//
-// // Then
-// Exception e = assertThrows(Exception.class, () -> {
-// tx.run("RETURN 1");
-// tx.commit();
-// });
-// assertThat(e.getMessage(), startsWith("Cannot run more queries in this transaction"));
-// }
-// }
-//
-// @Test
-// void shouldAllowMoreTxAfterSessionResetInTx() {
-// // Given
-// try (Session session = neo4j.driver().session()) {
-// try (Transaction ignore = session.beginTransaction()) {
-// // When reset the state of this session
-// session.reset();
-// }
-//
-// // Then can run more Tx
-// try (Transaction tx = session.beginTransaction()) {
-// tx.run("RETURN 2");
-// tx.commit();
-// }
-// }
-// }
-//
-// @Test
-// void resetShouldStopQueryWaitingForALock() throws Exception {
-// testResetOfQueryWaitingForLock(new NodeIdUpdater() {
-// @Override
-// void performUpdate(
-// Driver driver,
-// int nodeId,
-// int newNodeId,
-// AtomicReference usedSessionRef,
-// CountDownLatch latchToWait)
-// throws Exception {
-// try (Session session = driver.session()) {
-// usedSessionRef.set(session);
-// latchToWait.await();
-// Result result = updateNodeId(session, nodeId, newNodeId);
-// result.consume();
-// }
-// }
-// });
-// }
-//
-// @Test
-// void resetShouldStopTransactionWaitingForALock() throws Exception {
-// testResetOfQueryWaitingForLock(new NodeIdUpdater() {
-// @Override
-// public void performUpdate(
-// Driver driver,
-// int nodeId,
-// int newNodeId,
-// AtomicReference usedSessionRef,
-// CountDownLatch latchToWait)
-// throws Exception {
-// try (Session session = neo4j.driver().session();
-// Transaction tx = session.beginTransaction()) {
-// usedSessionRef.set(session);
-// latchToWait.await();
-// Result result = updateNodeId(tx, nodeId, newNodeId);
-// result.consume();
-// }
-// }
-// });
-// }
-//
-// @Test
-// void resetShouldStopWriteTransactionWaitingForALock() throws Exception {
-// AtomicInteger invocationsOfWork = new AtomicInteger();
-//
-// testResetOfQueryWaitingForLock(new NodeIdUpdater() {
-// @Override
-// public void performUpdate(
-// Driver driver,
-// int nodeId,
-// int newNodeId,
-// AtomicReference usedSessionRef,
-// CountDownLatch latchToWait)
-// throws Exception {
-// try (Session session = driver.session()) {
-// usedSessionRef.set(session);
-// latchToWait.await();
-//
-// session.writeTransaction(tx -> {
-// invocationsOfWork.incrementAndGet();
-// Result result = updateNodeId(tx, nodeId, newNodeId);
-// result.consume();
-// return null;
-// });
-// }
-// }
-// });
-//
-// assertEquals(1, invocationsOfWork.get());
-// }
-//
-// @Test
-// void shouldBeAbleToRunMoreQueriesAfterResetOnNoErrorState() {
-// try (Session session = neo4j.driver().session()) {
-// // Given
-// session.reset();
-//
-// // When
-// Transaction tx = session.beginTransaction();
-// tx.run("CREATE (n:FirstNode)");
-// tx.commit();
-//
-// // Then the outcome of both queries should be visible
-// Result result = session.run("MATCH (n) RETURN count(n)");
-// long nodes = result.single().get("count(n)").asLong();
-// assertThat(nodes, equalTo(1L));
-// }
-// }
-//
-// @Test
-// void shouldHandleResetBeforeRun() {
-// try (Session session = neo4j.driver().session();
-// Transaction tx = session.beginTransaction()) {
-// session.reset();
-//
-// ClientException e = assertThrows(ClientException.class, () -> tx.run("CREATE (n:FirstNode)"));
-// assertThat(e.getMessage(), containsString("Cannot run more queries in this transaction"));
-// }
-// }
-//
-// @Test
-// void shouldHandleResetFromMultipleThreads() throws Throwable {
-// Session session = neo4j.driver().session();
-//
-// CountDownLatch beforeCommit = new CountDownLatch(1);
-// CountDownLatch afterReset = new CountDownLatch(1);
-//
-// Future txFuture = executor.submit(() -> {
-// Transaction tx1 = session.beginTransaction();
-// tx1.run("CREATE (n:FirstNode)");
-// beforeCommit.countDown();
-// afterReset.await();
-//
-// // session has been reset, it should not be possible to commit the transaction
-// try {
-// tx1.commit();
-// } catch (Neo4jException ignore) {
-// }
-//
-// try (Transaction tx2 = session.beginTransaction()) {
-// tx2.run("CREATE (n:SecondNode)");
-// tx2.commit();
-// }
-//
-// return null;
-// });
-//
-// Future resetFuture = executor.submit(() -> {
-// beforeCommit.await();
-// session.reset();
-// afterReset.countDown();
-// return null;
-// });
-//
-// executor.shutdown();
-// executor.awaitTermination(20, SECONDS);
-//
-// txFuture.get(20, SECONDS);
-// resetFuture.get(20, SECONDS);
-//
-// assertEquals(0, countNodes("FirstNode"));
-// assertEquals(1, countNodes("SecondNode"));
-// }
-//
-// private void testResetOfQueryWaitingForLock(NodeIdUpdater nodeIdUpdater) throws Exception {
-// int nodeId = 42;
-// int newNodeId1 = 4242;
-// int newNodeId2 = 424242;
-//
-// createNodeWithId(nodeId);
-//
-// CountDownLatch nodeLocked = new CountDownLatch(1);
-// AtomicReference otherSessionRef = new AtomicReference<>();
-//
-// try (Session session = neo4j.driver().session();
-// Transaction tx = session.beginTransaction()) {
-// Future txResult = nodeIdUpdater.update(nodeId, newNodeId1, otherSessionRef, nodeLocked);
-//
-// Result result = updateNodeId(tx, nodeId, newNodeId2);
-// result.consume();
-//
-// nodeLocked.countDown();
-// // give separate thread some time to block on a lock
-// Thread.sleep(2_000);
-// otherSessionRef.get().reset();
-//
-// assertTransactionTerminated(txResult);
-// tx.commit();
-// }
-//
-// try (Session session = neo4j.driver().session()) {
-// Result result = session.run("MATCH (n) RETURN n.id AS id");
-// int value = result.single().get("id").asInt();
-// assertEquals(newNodeId2, value);
-// }
-// }
-//
-// private void createNodeWithId(int id) {
-// try (Session session = neo4j.driver().session()) {
-// session.run("CREATE (n {id: $id})", parameters("id", id));
-// }
-// }
-//
-// private static Result updateNodeId(QueryRunner queryRunner, int currentId, int newId) {
-// return queryRunner.run(
-// "MATCH (n {id: $currentId}) SET n.id = $newId", parameters("currentId", currentId, "newId", newId));
-// }
-//
-// private static void assertTransactionTerminated(Future work) {
-// ExecutionException e = assertThrows(ExecutionException.class, () -> work.get(20, TimeUnit.SECONDS));
-// assertThat(e.getCause(), CoreMatchers.instanceOf(TransientException.class));
-// assertThat(e.getCause().getMessage(), startsWith("The transaction has been terminated"));
-// }
-//
-// private void testRandomQueryTermination(boolean autoCommit) throws Exception {
-// Set runningSessions = newSetFromMap(new ConcurrentHashMap<>());
-// AtomicBoolean stop = new AtomicBoolean();
-// List> futures = new ArrayList<>();
-//
-// for (int i = 0; i < STRESS_TEST_THREAD_COUNT; i++) {
-// futures.add(executor.submit(() -> {
-// ThreadLocalRandom random = ThreadLocalRandom.current();
-// while (!stop.get()) {
-// runRandomQuery(autoCommit, random, runningSessions, stop);
-// }
-// }));
-// }
-//
-// long deadline = System.currentTimeMillis() + STRESS_TEST_DURATION_MS;
-// while (!stop.get()) {
-// if (System.currentTimeMillis() > deadline) {
-// stop.set(true);
-// }
-//
-// resetAny(runningSessions);
-//
-// MILLISECONDS.sleep(30);
-// }
-//
-// awaitAllFutures(futures);
-// awaitNoActiveQueries();
-// }
-//
-// private void runRandomQuery(boolean autoCommit, Random random, Set runningSessions, AtomicBoolean stop) {
-// try {
-// Session session = neo4j.driver().session();
-// runningSessions.add(session);
-// try {
-// String query = STRESS_TEST_QUERIES[random.nextInt(STRESS_TEST_QUERIES.length - 1)];
-// runQuery(session, query, autoCommit);
-// } finally {
-// runningSessions.remove(session);
-// session.close();
-// }
-// } catch (Throwable error) {
-// if (!stop.get() && !isAcceptable(error)) {
-// stop.set(true);
-// throw error;
-// }
-// // else it is fine to receive some errors from the driver because
-// // sessions are being reset concurrently by the main thread, driver can also be closed concurrently
-// }
-// }
-//
-// private void testQueryTermination(String query, boolean autoCommit) {
-// Future queryResult = runQueryInDifferentThreadAndResetSession(query, autoCommit);
-// ExecutionException e = assertThrows(ExecutionException.class, () -> queryResult.get(10, SECONDS));
-// assertThat(e.getCause(), instanceOf(Neo4jException.class));
-// awaitNoActiveQueries();
-// }
-//
-// private Future runQueryInDifferentThreadAndResetSession(String query, boolean autoCommit) {
-// AtomicReference sessionRef = new AtomicReference<>();
-//
-// Future queryResult = runAsync(() -> {
-// Session session = neo4j.driver().session();
-// sessionRef.set(session);
-// runQuery(session, query, autoCommit);
-// });
-//
-// awaitActiveQueriesToContain(query);
-//
-// Session session = sessionRef.get();
-// assertNotNull(session);
-// session.reset();
-//
-// return queryResult;
-// }
-//
-// private static void runQuery(Session session, String query, boolean autoCommit) {
-// if (autoCommit) {
-// session.run(query).consume();
-// } else {
-// try (Transaction tx = session.beginTransaction()) {
-// tx.run(query);
-// tx.commit();
-// }
-// }
-// }
-//
-// private void awaitNoActiveQueries() {
-// awaitCondition(() -> activeQueryCount(neo4j.driver()) == 0);
-// }
-//
-// private void awaitActiveQueriesToContain(String value) {
-// awaitCondition(() -> activeQueryNames(neo4j.driver()).stream().anyMatch(query -> query.contains(value)));
-// }
-//
-// private long countNodes() {
-// return countNodes(null);
-// }
-//
-// private long countNodes(String label) {
-// try (Session session = neo4j.driver().session()) {
-// Result result =
-// session.run("MATCH (n" + (label == null ? "" : ":" + label) + ") RETURN count(n) AS result");
-// return result.single().get(0).asLong();
-// }
-// }
-//
-// private static void resetAny(Set sessions) {
-// sessions.stream().findAny().ifPresent(session -> {
-// if (sessions.remove(session)) {
-// resetSafely(session);
-// }
-// });
-// }
-//
-// private static void resetSafely(Session session) {
-// try {
-// if (session.isOpen()) {
-// session.reset();
-// }
-// } catch (ClientException e) {
-// if (session.isOpen()) {
-// throw e;
-// }
-// // else this thread lost race with close and it's fine
-// }
-// }
-//
-// private static boolean isAcceptable(Throwable error) {
-// // get the root cause
-// while (error.getCause() != null) {
-// error = error.getCause();
-// }
-//
-// return isTransactionTerminatedException(error)
-// || error instanceof ServiceUnavailableException
-// || error instanceof ClientException
-// || error instanceof ClosedChannelException;
-// }
-//
-// private static boolean isTransactionTerminatedException(Throwable error) {
-// return error instanceof TransientException
-// && error.getMessage().startsWith("The transaction has been terminated")
-// || error.getMessage().startsWith("Trying to execute query in a terminated transaction");
-// }
-//
-// private static String longPeriodicCommitQuery() {
-// URI fileUri = createTmpCsvFile();
-// return String.format(LONG_PERIODIC_COMMIT_QUERY_TEMPLATE, fileUri);
-// }
-//
-// private static URI createTmpCsvFile() {
-// try {
-// Path importDir = Paths.get(HOME_DIR, TEST_SETTINGS.propertiesMap().get(IMPORT_DIR));
-// Path csvFile = Files.createTempFile(importDir, "test", ".csv");
-// Iterable lines = range(0, CSV_FILE_SIZE).mapToObj(i -> "Foo-" + i + ", Bar-" + i)::iterator;
-// return URI.create("file:///" + Files.write(csvFile, lines).getFileName());
-// } catch (IOException e) {
-// throw new UncheckedIOException(e);
-// }
-// }
-//
-// private abstract class NodeIdUpdater {
-// final Future update(
-// int nodeId, int newNodeId, AtomicReference usedSessionRef, CountDownLatch latchToWait) {
-// return executor.submit(() -> {
-// performUpdate(neo4j.driver(), nodeId, newNodeId, usedSessionRef, latchToWait);
-// return null;
-// });
-// }
-//
-// abstract void performUpdate(
-// Driver driver,
-// int nodeId,
-// int newNodeId,
-// AtomicReference usedSessionRef,
-// CountDownLatch latchToWait)
-// throws Exception;
-// }
-//}
+package org.neo4j.driver.integration;
+
+import static java.util.Collections.newSetFromMap;
+import static java.util.concurrent.CompletableFuture.runAsync;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static java.util.stream.IntStream.range;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.startsWith;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.lessThanOrEqualTo;
+import static org.hamcrest.junit.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+import static org.neo4j.driver.Values.parameters;
+import static org.neo4j.driver.util.DaemonThreadFactory.daemon;
+import static org.neo4j.driver.util.TestUtil.activeQueryCount;
+import static org.neo4j.driver.util.TestUtil.activeQueryNames;
+import static org.neo4j.driver.util.TestUtil.awaitAllFutures;
+import static org.neo4j.driver.util.TestUtil.awaitCondition;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.channels.ClosedChannelException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
+import org.hamcrest.CoreMatchers;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.neo4j.driver.Driver;
+import org.neo4j.driver.QueryRunner;
+import org.neo4j.driver.Result;
+import org.neo4j.driver.Session;
+import org.neo4j.driver.Transaction;
+import org.neo4j.driver.exceptions.ClientException;
+import org.neo4j.driver.exceptions.Neo4jException;
+import org.neo4j.driver.exceptions.ServiceUnavailableException;
+import org.neo4j.driver.exceptions.TransientException;
+import org.neo4j.driver.util.DatabaseExtension;
+import org.neo4j.driver.util.ParallelizableIT;
+
+@SuppressWarnings("deprecation")
+@ParallelizableIT
+class SessionResetIT {
+ private static final int CSV_FILE_SIZE = 10_000;
+ private static final int LOAD_CSV_BATCH_SIZE = 10;
+
+ private static final String SHORT_QUERY_1 = "CREATE (n:Node {name: 'foo', occupation: 'bar'})";
+ private static final String SHORT_QUERY_2 = "MATCH (n:Node {name: 'foo'}) RETURN count(n)";
+ private static final String LONG_QUERY = "UNWIND range(0, 10000000) AS i CREATE (n:Node {idx: i}) DELETE n";
+ private static final String LONG_PERIODIC_COMMIT_QUERY_TEMPLATE = "USING PERIODIC COMMIT 1 "
+ + "LOAD CSV FROM '%s' AS line "
+ + "UNWIND range(1, "
+ + LOAD_CSV_BATCH_SIZE + ") AS index " + "CREATE (n:Node {id: index, name: line[0], occupation: line[1]})";
+
+ private static final int STRESS_TEST_THREAD_COUNT = Runtime.getRuntime().availableProcessors() * 2;
+ private static final long STRESS_TEST_DURATION_MS = SECONDS.toMillis(5);
+ private static final String[] STRESS_TEST_QUERIES = {SHORT_QUERY_1, SHORT_QUERY_2, LONG_QUERY};
+
+ @RegisterExtension
+ static final DatabaseExtension neo4j = new DatabaseExtension();
+
+ private ExecutorService executor;
+
+ @BeforeEach
+ void setUp() {
+ executor = Executors.newCachedThreadPool(daemon(getClass().getSimpleName() + "-thread"));
+ }
+
+ @AfterEach
+ void tearDown() {
+ if (executor != null) {
+ executor.shutdownNow();
+ }
+ }
+
+ @Test
+ void shouldTerminateAutoCommitQuery() {
+ testQueryTermination(LONG_QUERY, true);
+ }
+
+ @Test
+ void shouldTerminateQueryInUnmanagedTransaction() {
+ testQueryTermination(LONG_QUERY, false);
+ }
+
+ /**
+ * It is currently unsafe to terminate periodic commit query because it'll then be half-committed.
+ * So the driver give no guarantee when the periodic commit could be terminated.
+ * For a user who want to terminate a periodic commit, he or she should use kill query by id.
+ */
+ @Test
+ void shouldTerminatePeriodicCommitQueryRandomly() {
+ assumeTrue(neo4j.isNeo4j44OrEarlier());
+ Future queryResult = runQueryInDifferentThreadAndResetSession(longPeriodicCommitQuery(), true);
+
+ ExecutionException e = assertThrows(ExecutionException.class, () -> queryResult.get(1, MINUTES));
+ assertThat(e.getCause(), instanceOf(Neo4jException.class));
+
+ awaitNoActiveQueries();
+
+ assertThat(countNodes(), lessThanOrEqualTo(((long) CSV_FILE_SIZE) * LOAD_CSV_BATCH_SIZE));
+ }
+
+ @Test
+ void shouldTerminateAutoCommitQueriesRandomly() throws Exception {
+ testRandomQueryTermination(true);
+ }
+
+ @Test
+ void shouldTerminateQueriesInUnmanagedTransactionsRandomly() throws Exception {
+ testRandomQueryTermination(false);
+ }
+
+ private void resetSessionAfterTimeout(Session session, int timeout) {
+ executor.submit(() -> {
+ try {
+ Thread.sleep(timeout * 1000); // let the query execute for timeout seconds
+ } catch (InterruptedException ignore) {
+ } finally {
+ session.reset(); // reset the session after timeout
+ }
+ });
+ }
+
+ @Test
+ void shouldAllowMoreQueriesAfterSessionReset() {
+ // Given
+ try (Session session = neo4j.driver().session()) {
+
+ session.run("RETURN 1").consume();
+
+ // When reset the state of this session
+ session.reset();
+
+ // Then can run successfully more queries without any error
+ session.run("RETURN 2").consume();
+ }
+ }
+
+ @Test
+ void shouldAllowMoreTxAfterSessionReset() {
+ // Given
+ try (Session session = neo4j.driver().session()) {
+ try (Transaction tx = session.beginTransaction()) {
+ tx.run("RETURN 1");
+ tx.commit();
+ }
+
+ // When reset the state of this session
+ session.reset();
+
+ // Then can run more Tx
+ try (Transaction tx = session.beginTransaction()) {
+ tx.run("RETURN 2");
+ tx.commit();
+ }
+ }
+ }
+
+ @Test
+ void shouldMarkTxAsFailedAndDisallowRunAfterSessionReset() {
+ // Given
+ try (Session session = neo4j.driver().session()) {
+ Transaction tx = session.beginTransaction();
+ // When reset the state of this session
+ session.reset();
+
+ // Then
+ Exception e = assertThrows(Exception.class, () -> {
+ tx.run("RETURN 1");
+ tx.commit();
+ });
+ assertThat(e.getMessage(), startsWith("Cannot run more queries in this transaction"));
+ }
+ }
+
+ @Test
+ void shouldAllowMoreTxAfterSessionResetInTx() {
+ // Given
+ try (Session session = neo4j.driver().session()) {
+ try (Transaction ignore = session.beginTransaction()) {
+ // When reset the state of this session
+ session.reset();
+ }
+
+ // Then can run more Tx
+ try (Transaction tx = session.beginTransaction()) {
+ tx.run("RETURN 2");
+ tx.commit();
+ }
+ }
+ }
+
+ @Test
+ void resetShouldStopQueryWaitingForALock() throws Exception {
+ testResetOfQueryWaitingForLock(new NodeIdUpdater() {
+ @Override
+ void performUpdate(
+ Driver driver,
+ int nodeId,
+ int newNodeId,
+ AtomicReference usedSessionRef,
+ CountDownLatch latchToWait)
+ throws Exception {
+ try (Session session = driver.session()) {
+ usedSessionRef.set(session);
+ latchToWait.await();
+ Result result = updateNodeId(session, nodeId, newNodeId);
+ result.consume();
+ }
+ }
+ });
+ }
+
+ @Test
+ void resetShouldStopTransactionWaitingForALock() throws Exception {
+ testResetOfQueryWaitingForLock(new NodeIdUpdater() {
+ @Override
+ public void performUpdate(
+ Driver driver,
+ int nodeId,
+ int newNodeId,
+ AtomicReference usedSessionRef,
+ CountDownLatch latchToWait)
+ throws Exception {
+ try (Session session = neo4j.driver().session();
+ Transaction tx = session.beginTransaction()) {
+ usedSessionRef.set(session);
+ latchToWait.await();
+ Result result = updateNodeId(tx, nodeId, newNodeId);
+ result.consume();
+ }
+ }
+ });
+ }
+
+ @Test
+ void resetShouldStopWriteTransactionWaitingForALock() throws Exception {
+ AtomicInteger invocationsOfWork = new AtomicInteger();
+
+ testResetOfQueryWaitingForLock(new NodeIdUpdater() {
+ @Override
+ public void performUpdate(
+ Driver driver,
+ int nodeId,
+ int newNodeId,
+ AtomicReference usedSessionRef,
+ CountDownLatch latchToWait)
+ throws Exception {
+ try (Session session = driver.session()) {
+ usedSessionRef.set(session);
+ latchToWait.await();
+
+ session.writeTransaction(tx -> {
+ invocationsOfWork.incrementAndGet();
+ Result result = updateNodeId(tx, nodeId, newNodeId);
+ result.consume();
+ return null;
+ });
+ }
+ }
+ });
+
+ assertEquals(1, invocationsOfWork.get());
+ }
+
+ @Test
+ void shouldBeAbleToRunMoreQueriesAfterResetOnNoErrorState() {
+ try (Session session = neo4j.driver().session()) {
+ // Given
+ session.reset();
+
+ // When
+ Transaction tx = session.beginTransaction();
+ tx.run("CREATE (n:FirstNode)");
+ tx.commit();
+
+ // Then the outcome of both queries should be visible
+ Result result = session.run("MATCH (n) RETURN count(n)");
+ long nodes = result.single().get("count(n)").asLong();
+ assertThat(nodes, equalTo(1L));
+ }
+ }
+
+ @Test
+ void shouldHandleResetBeforeRun() {
+ try (Session session = neo4j.driver().session();
+ Transaction tx = session.beginTransaction()) {
+ session.reset();
+
+ ClientException e = assertThrows(ClientException.class, () -> tx.run("CREATE (n:FirstNode)"));
+ assertThat(e.getMessage(), containsString("Cannot run more queries in this transaction"));
+ }
+ }
+
+ @Test
+ void shouldHandleResetFromMultipleThreads() throws Throwable {
+ Session session = neo4j.driver().session();
+
+ CountDownLatch beforeCommit = new CountDownLatch(1);
+ CountDownLatch afterReset = new CountDownLatch(1);
+
+ Future txFuture = executor.submit(() -> {
+ Transaction tx1 = session.beginTransaction();
+ tx1.run("CREATE (n:FirstNode)");
+ beforeCommit.countDown();
+ afterReset.await();
+
+ // session has been reset, it should not be possible to commit the transaction
+ try {
+ tx1.commit();
+ } catch (Neo4jException ignore) {
+ }
+
+ try (Transaction tx2 = session.beginTransaction()) {
+ tx2.run("CREATE (n:SecondNode)");
+ tx2.commit();
+ }
+
+ return null;
+ });
+
+ Future resetFuture = executor.submit(() -> {
+ beforeCommit.await();
+ session.reset();
+ afterReset.countDown();
+ return null;
+ });
+
+ executor.shutdown();
+ executor.awaitTermination(20, SECONDS);
+
+ txFuture.get(20, SECONDS);
+ resetFuture.get(20, SECONDS);
+
+ assertEquals(0, countNodes("FirstNode"));
+ assertEquals(1, countNodes("SecondNode"));
+ }
+
+ private void testResetOfQueryWaitingForLock(NodeIdUpdater nodeIdUpdater) throws Exception {
+ assumeTrue(neo4j.isNeo4j44OrEarlier());
+ int nodeId = 42;
+ int newNodeId1 = 4242;
+ int newNodeId2 = 424242;
+
+ createNodeWithId(nodeId);
+
+ CountDownLatch nodeLocked = new CountDownLatch(1);
+ AtomicReference otherSessionRef = new AtomicReference<>();
+
+ try (Session session = neo4j.driver().session();
+ Transaction tx = session.beginTransaction()) {
+ Future txResult = nodeIdUpdater.update(nodeId, newNodeId1, otherSessionRef, nodeLocked);
+
+ Result result = updateNodeId(tx, nodeId, newNodeId2);
+ result.consume();
+
+ nodeLocked.countDown();
+ // give separate thread some time to block on a lock
+ Thread.sleep(2_000);
+ otherSessionRef.get().reset();
+
+ assertTransactionTerminated(txResult);
+ tx.commit();
+ }
+
+ try (Session session = neo4j.driver().session()) {
+ Result result = session.run("MATCH (n) RETURN n.id AS id");
+ int value = result.single().get("id").asInt();
+ assertEquals(newNodeId2, value);
+ }
+ }
+
+ private void createNodeWithId(int id) {
+ try (Session session = neo4j.driver().session()) {
+ session.run("CREATE (n {id: $id})", parameters("id", id));
+ }
+ }
+
+ private static Result updateNodeId(QueryRunner queryRunner, int currentId, int newId) {
+ return queryRunner.run(
+ "MATCH (n {id: $currentId}) SET n.id = $newId", parameters("currentId", currentId, "newId", newId));
+ }
+
+ private static void assertTransactionTerminated(Future work) {
+ ExecutionException e = assertThrows(ExecutionException.class, () -> work.get(20, TimeUnit.SECONDS));
+ assertThat(e.getCause(), CoreMatchers.instanceOf(TransientException.class));
+ assertThat(e.getCause().getMessage(), startsWith("The transaction has been terminated"));
+ }
+
+ private void testRandomQueryTermination(boolean autoCommit) throws Exception {
+ assumeTrue(neo4j.isNeo4j44OrEarlier());
+ Set runningSessions = newSetFromMap(new ConcurrentHashMap<>());
+ AtomicBoolean stop = new AtomicBoolean();
+ List> futures = new ArrayList<>();
+
+ for (int i = 0; i < STRESS_TEST_THREAD_COUNT; i++) {
+ futures.add(executor.submit(() -> {
+ ThreadLocalRandom random = ThreadLocalRandom.current();
+ while (!stop.get()) {
+ runRandomQuery(autoCommit, random, runningSessions, stop);
+ }
+ }));
+ }
+
+ long deadline = System.currentTimeMillis() + STRESS_TEST_DURATION_MS;
+ while (!stop.get()) {
+ if (System.currentTimeMillis() > deadline) {
+ stop.set(true);
+ }
+
+ resetAny(runningSessions);
+
+ MILLISECONDS.sleep(30);
+ }
+
+ awaitAllFutures(futures);
+ awaitNoActiveQueries();
+ }
+
+ private void runRandomQuery(boolean autoCommit, Random random, Set runningSessions, AtomicBoolean stop) {
+ try {
+ Session session = neo4j.driver().session();
+ runningSessions.add(session);
+ try {
+ String query = STRESS_TEST_QUERIES[random.nextInt(STRESS_TEST_QUERIES.length - 1)];
+ runQuery(session, query, autoCommit);
+ } finally {
+ runningSessions.remove(session);
+ session.close();
+ }
+ } catch (Throwable error) {
+ if (!stop.get() && !isAcceptable(error)) {
+ stop.set(true);
+ throw error;
+ }
+ // else it is fine to receive some errors from the driver because
+ // sessions are being reset concurrently by the main thread, driver can also be closed concurrently
+ }
+ }
+
+ private void testQueryTermination(String query, boolean autoCommit) {
+ assumeTrue(neo4j.isNeo4j44OrEarlier());
+ Future queryResult = runQueryInDifferentThreadAndResetSession(query, autoCommit);
+ ExecutionException e = assertThrows(ExecutionException.class, () -> queryResult.get(10, SECONDS));
+ assertThat(e.getCause(), instanceOf(Neo4jException.class));
+ awaitNoActiveQueries();
+ }
+
+ private Future runQueryInDifferentThreadAndResetSession(String query, boolean autoCommit) {
+ AtomicReference sessionRef = new AtomicReference<>();
+
+ Future queryResult = runAsync(() -> {
+ Session session = neo4j.driver().session();
+ sessionRef.set(session);
+ runQuery(session, query, autoCommit);
+ });
+
+ awaitActiveQueriesToContain(query);
+
+ Session session = sessionRef.get();
+ assertNotNull(session);
+ session.reset();
+
+ return queryResult;
+ }
+
+ private static void runQuery(Session session, String query, boolean autoCommit) {
+ if (autoCommit) {
+ session.run(query).consume();
+ } else {
+ try (Transaction tx = session.beginTransaction()) {
+ tx.run(query);
+ tx.commit();
+ }
+ }
+ }
+
+ private void awaitNoActiveQueries() {
+ awaitCondition(() -> activeQueryCount(neo4j.driver()) == 0);
+ }
+
+ private void awaitActiveQueriesToContain(String value) {
+ awaitCondition(() -> activeQueryNames(neo4j.driver()).stream().anyMatch(query -> query.contains(value)));
+ }
+
+ private long countNodes() {
+ return countNodes(null);
+ }
+
+ private long countNodes(String label) {
+ try (Session session = neo4j.driver().session()) {
+ Result result =
+ session.run("MATCH (n" + (label == null ? "" : ":" + label) + ") RETURN count(n) AS result");
+ return result.single().get(0).asLong();
+ }
+ }
+
+ private static void resetAny(Set sessions) {
+ sessions.stream().findAny().ifPresent(session -> {
+ if (sessions.remove(session)) {
+ resetSafely(session);
+ }
+ });
+ }
+
+ private static void resetSafely(Session session) {
+ try {
+ if (session.isOpen()) {
+ session.reset();
+ }
+ } catch (ClientException e) {
+ if (session.isOpen()) {
+ throw e;
+ }
+ // else this thread lost race with close and it's fine
+ }
+ }
+
+ private static boolean isAcceptable(Throwable error) {
+ // get the root cause
+ while (error.getCause() != null) {
+ error = error.getCause();
+ }
+
+ return isTransactionTerminatedException(error)
+ || error instanceof ServiceUnavailableException
+ || error instanceof ClientException
+ || error instanceof ClosedChannelException;
+ }
+
+ private static boolean isTransactionTerminatedException(Throwable error) {
+ return error instanceof TransientException
+ && error.getMessage().startsWith("The transaction has been terminated")
+ || error.getMessage().startsWith("Trying to execute query in a terminated transaction");
+ }
+
+ private static String longPeriodicCommitQuery() {
+ String fileUri = createTmpCsvFile();
+ return String.format(LONG_PERIODIC_COMMIT_QUERY_TEMPLATE, fileUri);
+ }
+
+ private static String createTmpCsvFile() {
+ String lines = range(0, CSV_FILE_SIZE)
+ .mapToObj(i -> "Foo-" + i + ", Bar-" + i)
+ .collect(Collectors.joining(System.lineSeparator()));
+ try {
+ return neo4j.addImportFile("iris", ".csv", lines);
+ } catch (IOException e) {
+ throw new UncheckedIOException(e);
+ }
+ }
+
+ private abstract class NodeIdUpdater {
+ final Future update(
+ int nodeId, int newNodeId, AtomicReference usedSessionRef, CountDownLatch latchToWait) {
+ return executor.submit(() -> {
+ performUpdate(neo4j.driver(), nodeId, newNodeId, usedSessionRef, latchToWait);
+ return null;
+ });
+ }
+
+ abstract void performUpdate(
+ Driver driver,
+ int nodeId,
+ int newNodeId,
+ AtomicReference usedSessionRef,
+ CountDownLatch latchToWait)
+ throws Exception;
+ }
+}
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 6aa0c63216..27bcae7474 100644
--- a/driver/src/test/java/org/neo4j/driver/integration/SummaryIT.java
+++ b/driver/src/test/java/org/neo4j/driver/integration/SummaryIT.java
@@ -27,6 +27,7 @@
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
import static org.neo4j.driver.SessionConfig.forDatabase;
import java.util.List;
@@ -106,55 +107,64 @@ void shouldContainTimeInformation() {
@Test
void shouldContainCorrectStatistics() {
- assertThat(session.run("CREATE (n)").consume().counters().nodesCreated(), equalTo(1));
- assertThat(session.run("MATCH (n) DELETE (n)").consume().counters().nodesDeleted(), equalTo(1));
-
- assertThat(session.run("CREATE ()-[:KNOWS]->()").consume().counters().relationshipsCreated(), equalTo(1));
- assertThat(
- session.run("MATCH ()-[r:KNOWS]->() DELETE r")
- .consume()
- .counters()
- .relationshipsDeleted(),
- equalTo(1));
-
- assertThat(session.run("CREATE (n:ALabel)").consume().counters().labelsAdded(), equalTo(1));
- assertThat(session.run("CREATE (n {magic: 42})").consume().counters().propertiesSet(), equalTo(1));
- assertTrue(session.run("CREATE (n {magic: 42})").consume().counters().containsUpdates());
- assertThat(
- session.run("MATCH (n:ALabel) REMOVE n:ALabel ")
- .consume()
- .counters()
- .labelsRemoved(),
- equalTo(1));
-
- assertThat(
- session.run("CREATE INDEX ON :ALabel(prop)")
- .consume()
- .counters()
- .indexesAdded(),
- equalTo(1));
- assertThat(
- session.run("DROP INDEX ON :ALabel(prop)").consume().counters().indexesRemoved(), equalTo(1));
-
- assertThat(
- session.run("CREATE CONSTRAINT ON (book:Book) ASSERT book.isbn IS UNIQUE")
- .consume()
- .counters()
- .constraintsAdded(),
- equalTo(1));
- assertThat(
- session.run("DROP CONSTRAINT ON (book:Book) ASSERT book.isbn IS UNIQUE")
- .consume()
- .counters()
- .constraintsRemoved(),
- equalTo(1));
+ if (neo4j.isNeo4j44OrEarlier()) {
+ assertThat(session.run("CREATE (n)").consume().counters().nodesCreated(), equalTo(1));
+ assertThat(session.run("MATCH (n) DELETE (n)").consume().counters().nodesDeleted(), equalTo(1));
+
+ assertThat(
+ session.run("CREATE ()-[:KNOWS]->()").consume().counters().relationshipsCreated(), equalTo(1));
+ assertThat(
+ session.run("MATCH ()-[r:KNOWS]->() DELETE r")
+ .consume()
+ .counters()
+ .relationshipsDeleted(),
+ equalTo(1));
+
+ assertThat(session.run("CREATE (n:ALabel)").consume().counters().labelsAdded(), equalTo(1));
+ assertThat(
+ session.run("CREATE (n {magic: 42})").consume().counters().propertiesSet(), equalTo(1));
+ assertTrue(
+ session.run("CREATE (n {magic: 42})").consume().counters().containsUpdates());
+ assertThat(
+ session.run("MATCH (n:ALabel) REMOVE n:ALabel ")
+ .consume()
+ .counters()
+ .labelsRemoved(),
+ equalTo(1));
+
+ assertThat(
+ session.run("CREATE INDEX ON :ALabel(prop)")
+ .consume()
+ .counters()
+ .indexesAdded(),
+ equalTo(1));
+ assertThat(
+ session.run("DROP INDEX ON :ALabel(prop)")
+ .consume()
+ .counters()
+ .indexesRemoved(),
+ equalTo(1));
+
+ assertThat(
+ session.run("CREATE CONSTRAINT ON (book:Book) ASSERT book.isbn IS UNIQUE")
+ .consume()
+ .counters()
+ .constraintsAdded(),
+ equalTo(1));
+ assertThat(
+ session.run("DROP CONSTRAINT ON (book:Book) ASSERT book.isbn IS UNIQUE")
+ .consume()
+ .counters()
+ .constraintsRemoved(),
+ equalTo(1));
+ }
}
@Test
@EnabledOnNeo4jWith(Neo4jFeature.BOLT_V4)
void shouldGetSystemUpdates() throws Throwable {
try (Session session = neo4j.driver().session(forDatabase("system"))) {
- Result result = session.run("CREATE USER foo SET PASSWORD 'bar'");
+ Result result = session.run("CREATE USER foo SET PASSWORD 'Testing5'");
assertThat(result.consume().counters().containsUpdates(), equalTo(false));
assertThat(result.consume().counters().containsSystemUpdates(), equalTo(true));
}
@@ -162,6 +172,7 @@ void shouldGetSystemUpdates() throws Throwable {
@Test
void shouldContainCorrectQueryType() {
+ assumeTrue(neo4j.isNeo4j44OrEarlier());
assertThat(session.run("MATCH (n) RETURN 1").consume().queryType(), equalTo(QueryType.READ_ONLY));
assertThat(session.run("CREATE (n)").consume().queryType(), equalTo(QueryType.WRITE_ONLY));
assertThat(session.run("CREATE (n) RETURN (n)").consume().queryType(), equalTo(QueryType.READ_WRITE));
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 7625de9d95..4c91dd782b 100644
--- a/driver/src/test/java/org/neo4j/driver/integration/TransactionBoltV3IT.java
+++ b/driver/src/test/java/org/neo4j/driver/integration/TransactionBoltV3IT.java
@@ -57,41 +57,45 @@ class TransactionBoltV3IT {
@Test
void shouldSetTransactionMetadata() {
- Map metadata = new HashMap<>();
- metadata.put("key1", "value1");
- metadata.put("key2", 42L);
- metadata.put("key3", false);
+ if (driver.isNeo4j44OrEarlier()) {
+ Map metadata = new HashMap<>();
+ metadata.put("key1", "value1");
+ metadata.put("key2", 42L);
+ metadata.put("key3", false);
- TransactionConfig config =
- TransactionConfig.builder().withMetadata(metadata).build();
+ TransactionConfig config =
+ TransactionConfig.builder().withMetadata(metadata).build();
- try (Transaction tx = driver.session().beginTransaction(config)) {
- tx.run("RETURN 1").consume();
+ try (Transaction tx = driver.session().beginTransaction(config)) {
+ tx.run("RETURN 1").consume();
- verifyTransactionMetadata(metadata);
+ verifyTransactionMetadata(metadata);
+ }
}
}
@Test
void shouldSetTransactionMetadataAsync() {
- Map metadata = new HashMap<>();
- metadata.put("hello", "world");
- metadata.put("key", ZonedDateTime.now());
-
- TransactionConfig config =
- TransactionConfig.builder().withMetadata(metadata).build();
-
- CompletionStage txFuture = driver.asyncSession()
- .beginTransactionAsync(config)
- .thenCompose(tx -> tx.runAsync("RETURN 1")
- .thenCompose(ResultCursor::consumeAsync)
- .thenApply(ignore -> tx));
-
- AsyncTransaction transaction = await(txFuture);
- try {
- verifyTransactionMetadata(metadata);
- } finally {
- await(transaction.rollbackAsync());
+ if (driver.isNeo4j44OrEarlier()) {
+ Map metadata = new HashMap<>();
+ metadata.put("hello", "world");
+ metadata.put("key", ZonedDateTime.now());
+
+ TransactionConfig config =
+ TransactionConfig.builder().withMetadata(metadata).build();
+
+ CompletionStage txFuture = driver.asyncSession()
+ .beginTransactionAsync(config)
+ .thenCompose(tx -> tx.runAsync("RETURN 1")
+ .thenCompose(ResultCursor::consumeAsync)
+ .thenApply(ignore -> tx));
+
+ AsyncTransaction transaction = await(txFuture);
+ try {
+ verifyTransactionMetadata(metadata);
+ } finally {
+ await(transaction.rollbackAsync());
+ }
}
}
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 888402e618..76f4b573f8 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
@@ -32,6 +32,7 @@
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
import static org.neo4j.driver.SessionConfig.builder;
import static org.neo4j.driver.Values.parameters;
import static org.neo4j.driver.internal.util.Futures.failedFuture;
@@ -275,7 +276,7 @@ void shouldExposeResultSummaryForExplainQuery() {
// server versions; that is why do fuzzy assertions in this test based on string content
String planAsString = summary.plan().toString().toLowerCase();
assertThat(planAsString, containsString("create"));
- assertThat(planAsString, containsString("expand"));
+ assertThat(planAsString, containsString("apply"));
assertNull(summary.profile());
assertEquals(0, summary.notifications().size());
assertThat(summary, containsResultAvailableAfterAndResultConsumedAfter());
@@ -646,6 +647,7 @@ public CompletionStage execute(AsyncTransaction tx) {
@Test
void shouldNotPropagateRunFailureWhenClosed() {
+ assumeTrue(neo4j.isNeo4j44OrEarlier());
session.runAsync("RETURN 10 / 0");
await(session.closeAsync());
@@ -653,6 +655,7 @@ void shouldNotPropagateRunFailureWhenClosed() {
@Test
void shouldPropagateRunFailureImmediately() {
+ assumeTrue(neo4j.isNeo4j44OrEarlier());
ClientException e = assertThrows(ClientException.class, () -> await(session.runAsync("RETURN 10 / 0")));
assertThat(e.getMessage(), containsString("/ by zero"));
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 b8831bfa89..f1ef9d0850 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
@@ -31,6 +31,7 @@
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
import static org.neo4j.driver.SessionConfig.builder;
import static org.neo4j.driver.Values.parameters;
import static org.neo4j.driver.internal.InternalBookmark.parse;
@@ -610,6 +611,7 @@ void shouldUpdateSessionBookmarkAfterCommit() {
@Test
void shouldFailToCommitWhenQueriesFail() {
+ assumeTrue(neo4j.isNeo4j44OrEarlier());
AsyncTransaction tx = await(session.beginTransactionAsync());
tx.runAsync("CREATE (:TestNode)");
@@ -637,6 +639,7 @@ void shouldFailToCommitWhenRunFailed() {
@Test
void shouldFailToCommitWhenBlockedRunFailed() {
+ assumeTrue(neo4j.isNeo4j44OrEarlier());
AsyncTransaction tx = await(session.beginTransactionAsync());
ClientException runException = assertThrows(ClientException.class, () -> await(tx.runAsync("RETURN 42 / 0")));
@@ -658,6 +661,7 @@ void shouldRollbackSuccessfullyWhenRunFailed() {
@Test
void shouldRollbackSuccessfullyWhenBlockedRunFailed() {
+ assumeTrue(neo4j.isNeo4j44OrEarlier());
AsyncTransaction tx = await(session.beginTransactionAsync());
assertThrows(ClientException.class, () -> await(tx.runAsync("RETURN 42 / 0")));
diff --git a/driver/src/test/java/org/neo4j/driver/tck/reactive/RxResultRecordPublisherVerificationIT.java b/driver/src/test/java/org/neo4j/driver/tck/reactive/RxResultRecordPublisherVerificationIT.java
index f3c2f90281..519bc90543 100644
--- a/driver/src/test/java/org/neo4j/driver/tck/reactive/RxResultRecordPublisherVerificationIT.java
+++ b/driver/src/test/java/org/neo4j/driver/tck/reactive/RxResultRecordPublisherVerificationIT.java
@@ -18,6 +18,14 @@
*/
package org.neo4j.driver.tck.reactive;
+import static org.neo4j.driver.Values.parameters;
+
+import java.time.Duration;
+import org.neo4j.driver.Driver;
+import org.neo4j.driver.GraphDatabase;
+import org.neo4j.driver.Record;
+import org.neo4j.driver.reactive.RxResult;
+import org.neo4j.driver.reactive.RxSession;
import org.reactivestreams.Publisher;
import org.reactivestreams.tck.PublisherVerification;
import org.reactivestreams.tck.TestEnvironment;
@@ -27,85 +35,63 @@
import org.testng.SkipException;
import org.testng.annotations.BeforeClass;
-import java.time.Duration;
+@Testcontainers(disabledWithoutDocker = true)
+public class RxResultRecordPublisherVerificationIT extends PublisherVerification {
+ private static final Neo4jContainer NEO4J_CONTAINER = new Neo4jContainer<>("neo4j:4.4").withAdminPassword(null);
-import org.neo4j.driver.Driver;
-import org.neo4j.driver.GraphDatabase;
-import org.neo4j.driver.Record;
-import org.neo4j.driver.reactive.RxResult;
-import org.neo4j.driver.reactive.RxSession;
+ private static final long MAX_NUMBER_OF_RECORDS = 30000;
-import static org.neo4j.driver.Values.parameters;
+ private static final Duration TIMEOUT = Duration.ofSeconds(10);
+ private static final Duration TIMEOUT_FOR_NO_SIGNALS = Duration.ofSeconds(1);
+ private static final Duration PUBLISHER_REFERENCE_CLEANUP_TIMEOUT_MILLIS = Duration.ofSeconds(1);
-@Testcontainers( disabledWithoutDocker = true )
-public class RxResultRecordPublisherVerificationIT extends PublisherVerification
-{
- private static final Neo4jContainer NEO4J_CONTAINER = new Neo4jContainer<>( "neo4j:4.4" )
- .withAdminPassword( null );
-
- private final static long MAX_NUMBER_OF_RECORDS = 30000;
-
- private static final Duration TIMEOUT = Duration.ofSeconds( 10 );
- private static final Duration TIMEOUT_FOR_NO_SIGNALS = Duration.ofSeconds( 1 );
- private static final Duration PUBLISHER_REFERENCE_CLEANUP_TIMEOUT_MILLIS = Duration.ofSeconds( 1 );
-
- private final static String QUERY = "UNWIND RANGE(1, $numberOfRecords) AS n RETURN 'String Number' + n";
+ private static final String QUERY = "UNWIND RANGE(1, $numberOfRecords) AS n RETURN 'String Number' + n";
private Driver driver;
- public RxResultRecordPublisherVerificationIT()
- {
- super( new TestEnvironment( TIMEOUT.toMillis(), TIMEOUT_FOR_NO_SIGNALS.toMillis() ),
- PUBLISHER_REFERENCE_CLEANUP_TIMEOUT_MILLIS.toMillis() );
+ public RxResultRecordPublisherVerificationIT() {
+ super(
+ new TestEnvironment(TIMEOUT.toMillis(), TIMEOUT_FOR_NO_SIGNALS.toMillis()),
+ PUBLISHER_REFERENCE_CLEANUP_TIMEOUT_MILLIS.toMillis());
}
@BeforeClass
- public void beforeClass()
- {
- if ( !isDockerAvailable() )
- {
- throw new SkipException( "Docker is unavailable" );
+ public void beforeClass() {
+ if (!isDockerAvailable()) {
+ throw new SkipException("Docker is unavailable");
}
NEO4J_CONTAINER.start();
- driver = GraphDatabase.driver( NEO4J_CONTAINER.getBoltUrl() );
+ driver = GraphDatabase.driver(NEO4J_CONTAINER.getBoltUrl());
}
- public void afterClass()
- {
+ public void afterClass() {
NEO4J_CONTAINER.stop();
}
@Override
- public long maxElementsFromPublisher()
- {
+ public long maxElementsFromPublisher() {
return MAX_NUMBER_OF_RECORDS;
}
@Override
- public Publisher createPublisher( long elements )
- {
+ public Publisher createPublisher(long elements) {
RxSession session = driver.rxSession();
- RxResult result = session.run( QUERY, parameters( "numberOfRecords", elements ) );
+ RxResult result = session.run(QUERY, parameters("numberOfRecords", elements));
return result.records();
}
@Override
- public Publisher createFailedPublisher()
- {
+ public Publisher createFailedPublisher() {
RxSession session = driver.rxSession();
- RxResult result = session.run( "INVALID" );
+ RxResult result = session.run("INVALID");
return result.records();
}
- boolean isDockerAvailable()
- {
- try
- {
+ boolean isDockerAvailable() {
+ try {
DockerClientFactory.instance().client();
return true;
- }
- catch ( Throwable ex )
- {
+ } catch (Throwable ex) {
return false;
}
}
diff --git a/driver/src/test/java/org/neo4j/driver/util/DatabaseExtension.java b/driver/src/test/java/org/neo4j/driver/util/DatabaseExtension.java
index c0eea975f1..db780ace50 100644
--- a/driver/src/test/java/org/neo4j/driver/util/DatabaseExtension.java
+++ b/driver/src/test/java/org/neo4j/driver/util/DatabaseExtension.java
@@ -246,10 +246,6 @@ public boolean isNeo4j44OrEarlier() {
return isNeo4jVersionOrEarlier(4, 4);
}
- public boolean isNeo4j43OrEarlier() {
- return isNeo4jVersionOrEarlier(4, 3);
- }
-
private boolean isNeo4jVersionOrEarlier(int major, int minor) {
try (Session session = driver.session()) {
String neo4jVersion = session.readTransaction(
diff --git a/pom.xml b/pom.xml
index 5b95d462ff..3129c34244 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,12 +48,12 @@
1.2.0
1.70
1.2.11
- 2.13.2
- 1.18.22
- 21.3.1
- 1.8.3
+ 2.13.3
+ 1.18.24
+ 21.3.2.1
+ 1.9.1
1.17.1
- 4.4.8
+ 4.4.14
diff --git a/testkit-tests/pom.xml b/testkit-tests/pom.xml
index f7a585911a..15b06fd824 100644
--- a/testkit-tests/pom.xml
+++ b/testkit-tests/pom.xml
@@ -19,7 +19,7 @@
${project.basedir}/..
https://github.com/neo4j-drivers/testkit.git
- 5.0
+ 4.4
--tests TESTKIT_TESTS INTEGRATION_TESTS STUB_TESTS STRESS_TESTS TLS_TESTS
7200000