Skip to content

Commit 1880b9f

Browse files
author
Zhen Li
committed
Fix failing tests due to test server java version changes and also server configuration changes
1 parent 098b81e commit 1880b9f

File tree

3 files changed

+4
-11
lines changed

3 files changed

+4
-11
lines changed

driver/src/test/java/org/neo4j/driver/integration/CredentialsIT.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ void shouldBePossibleToChangePassword() throws Exception
6464
String tmpDataDir = Files.createTempDirectory( Paths.get( "target" ), "tmp" ).toAbsolutePath().toString().replace( "\\", "/" );
6565

6666
neo4j.restartDb( Neo4jSettings.TEST_SETTINGS
67-
.updateWith( Neo4jSettings.AUTH_ENABLED, "true" )
6867
.updateWith( Neo4jSettings.DATA_DIR, tmpDataDir ) );
6968

7069
AuthToken authToken = new InternalAuthToken( parameters(

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,9 @@
2828

2929
public class Neo4jSettings
3030
{
31-
public static final String AUTH_ENABLED = "dbms.security.auth_enabled";
3231
public static final String DATA_DIR = "dbms.directories.data";
33-
public static final String CERT_DIR = "dbms.directories.certificates";
3432
public static final String IMPORT_DIR = "dbms.directories.import";
35-
public static final String LISTEN_ADDR = "dbms.connectors.default_listen_address"; // only valid for 3.1+
33+
public static final String LISTEN_ADDR = "dbms.connectors.default_listen_address";
3634
public static final String IPV6_ENABLED_ADDR = "::";
3735
public static final String PAGE_CACHE_SIZE = "dbms.memory.pagecache.size";
3836
public static final String BOLT_TLS_LEVEL = "dbms.connector.bolt.tls_level";
@@ -63,17 +61,13 @@ public class Neo4jSettings
6361

6462
public static final Neo4jSettings TEST_SETTINGS = new Neo4jSettings( map(
6563
"dbms.backup.enabled", "false",
66-
"dbms.memory.pagecache.size", "100m",
6764
"dbms.connector.http.listen_address", ":" + CURRENT_HTTP_PORT,
6865
"dbms.connector.https.listen_address", ":" + CURRENT_HTTPS_PORT,
6966
"dbms.connector.bolt.listen_address", ":" + CURRENT_BOLT_PORT,
7067
"dbms.windows_service_name", WINDOWS_SERVICE_NAME,
7168

72-
CERT_DIR, DEFAULT_CERT_DIR,
7369
DATA_DIR, DEFAULT_DATA_DIR,
7470
IMPORT_DIR, DEFAULT_IMPORT_DIR,
75-
AUTH_ENABLED, "true",
76-
PAGE_CACHE_SIZE, DEFAULT_PAGE_CACHE_SIZE,
7771
BOLT_TLS_LEVEL, DEFAULT_BOLT_TLS_LEVEL,
7872
LISTEN_ADDR, IPV6_ENABLED_ADDR ), Collections.<String>emptySet() );
7973

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ public final class TemporalUtil
5555
* Other time zones are not working correctly in some Java versions
5656
*/
5757
private static final List<String> BLACKLISTED_ZONE_IDS = Arrays.asList(
58-
// removed
5958
"Canada/East-Saskatchewan",
60-
// is broken for years in distant future in Java 11 (example of a misbehaving date: +71235332-08-09T22:41:50.738292551-06:00[Chile/EasterIsland])
6159
"Chile/EasterIsland",
62-
"Africa/Casablanca"
60+
"Africa/Casablanca",
61+
"tzid",
62+
"Asia/Qostanay"
6363
);
6464

6565
private TemporalUtil()

0 commit comments

Comments
 (0)