From 31c1c90d5103f5bd7c0a18a6b3970aa699516fde Mon Sep 17 00:00:00 2001 From: Dmitriy Tverdiakov Date: Tue, 10 May 2022 13:55:15 +0100 Subject: [PATCH] Update LoadCSVIT.shouldLoadCSV to work with 5.0 To make it work with 5.0, `server.directories.import` must be excluded from config. --- .../src/test/java/org/neo4j/driver/integration/LoadCSVIT.java | 4 +++- driver/src/test/java/org/neo4j/driver/util/Neo4jSettings.java | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/driver/src/test/java/org/neo4j/driver/integration/LoadCSVIT.java b/driver/src/test/java/org/neo4j/driver/integration/LoadCSVIT.java index 9b66754b7c..01b6b07a77 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/LoadCSVIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/LoadCSVIT.java @@ -40,7 +40,9 @@ class LoadCSVIT { @RegisterExtension - static final DatabaseExtension neo4j = new DatabaseExtension( Neo4jSettings.TEST_SETTINGS.without( Neo4jSettings.IMPORT_DIR ) ); + static final DatabaseExtension neo4j = new DatabaseExtension( Neo4jSettings.TEST_SETTINGS + .without( Neo4jSettings.IMPORT_DIR ) + .without( Neo4jSettings.SERVER_IMPORT_DIR ) ); @Test void shouldLoadCSV() throws Throwable diff --git a/driver/src/test/java/org/neo4j/driver/util/Neo4jSettings.java b/driver/src/test/java/org/neo4j/driver/util/Neo4jSettings.java index af09998f33..2276390be7 100644 --- a/driver/src/test/java/org/neo4j/driver/util/Neo4jSettings.java +++ b/driver/src/test/java/org/neo4j/driver/util/Neo4jSettings.java @@ -30,6 +30,8 @@ public class Neo4jSettings { public static final String DATA_DIR = "dbms.directories.data"; public static final String IMPORT_DIR = "dbms.directories.import"; + // 5.0 + public static final String SERVER_IMPORT_DIR = "server.directories.import"; public static final String LISTEN_ADDR = "dbms.default_listen_address"; public static final String IPV6_ENABLED_ADDR = "::"; public static final String BOLT_TLS_LEVEL = "dbms.connector.bolt.tls_level";