Skip to content

Commit f7bcdf1

Browse files
authored
Update Neo4jSettings for 5.0 server (#1254)
1 parent 020cd0f commit f7bcdf1

File tree

1 file changed

+24
-4
lines changed

1 file changed

+24
-4
lines changed

driver/src/test/java/org/neo4j/driver/util/Neo4jSettings.java

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,19 @@ public class Neo4jSettings {
4545

4646
static final int TEST_JVM_ID = Integer.getInteger("testJvmId", 0);
4747

48-
private static final int DEFAULT_HTTP_PORT = 7000;
49-
private static final int DEFAULT_HTTPS_PORT = 8000;
50-
private static final int DEFAULT_BOLT_PORT = 9000;
48+
private static final int DEFAULT_HTTP_PORT = 12000;
49+
private static final int DEFAULT_HTTPS_PORT = 13000;
50+
private static final int DEFAULT_BOLT_PORT = 14000;
51+
private static final int DEFAULT_DISCOVERY_LISTEN_PORT = 15000;
52+
private static final int DEFAULT_RAFT_ADVERTISED_PORT = 16000;
53+
private static final int DEFAULT_TX_LISTEN_PORT = 17000;
5154

5255
static final int CURRENT_HTTP_PORT = DEFAULT_HTTP_PORT + TEST_JVM_ID;
5356
private static final int CURRENT_HTTPS_PORT = DEFAULT_HTTPS_PORT + TEST_JVM_ID;
5457
static final int CURRENT_BOLT_PORT = DEFAULT_BOLT_PORT + TEST_JVM_ID;
58+
static final int CURRENT_DISCOVERY_LISTEN_PORT = DEFAULT_DISCOVERY_LISTEN_PORT + TEST_JVM_ID;
59+
static final int CURRENT_RAFT_ADVERTISED_PORT = DEFAULT_RAFT_ADVERTISED_PORT + TEST_JVM_ID;
60+
static final int CURRENT_TX_LISTEN_PORT = DEFAULT_TX_LISTEN_PORT + TEST_JVM_ID;
5561

5662
private static final String WINDOWS_SERVICE_NAME = "neo4j-" + TEST_JVM_ID;
5763

@@ -66,6 +72,20 @@ public class Neo4jSettings {
6672
":" + CURRENT_HTTPS_PORT,
6773
"dbms.connector.bolt.listen_address",
6874
":" + CURRENT_BOLT_PORT,
75+
"dbms.cluster.discovery.initial_members",
76+
"localhost:" + CURRENT_DISCOVERY_LISTEN_PORT,
77+
"server.discovery.listen_address",
78+
":" + CURRENT_DISCOVERY_LISTEN_PORT,
79+
"cluster.raft_advertised_address",
80+
":" + CURRENT_RAFT_ADVERTISED_PORT,
81+
"cluster.raft_listen_address",
82+
":" + CURRENT_RAFT_ADVERTISED_PORT,
83+
"cluster.transaction_listen_address",
84+
":" + CURRENT_TX_LISTEN_PORT,
85+
"cluster.transaction_advertised_address",
86+
":" + CURRENT_TX_LISTEN_PORT,
87+
"server.cluster.advertised_address",
88+
":" + CURRENT_TX_LISTEN_PORT,
6989
"dbms.windows_service_name",
7090
WINDOWS_SERVICE_NAME,
7191
DATA_DIR,
@@ -76,7 +96,7 @@ public class Neo4jSettings {
7696
DEFAULT_BOLT_TLS_LEVEL,
7797
LISTEN_ADDR,
7898
IPV6_ENABLED_ADDR),
79-
Collections.<String>emptySet());
99+
Collections.emptySet());
80100

81101
public enum BoltTlsLevel {
82102
OPTIONAL,

0 commit comments

Comments
 (0)