Skip to content

Commit 7988061

Browse files
lutovichlutovich
authored
Merge pull request #350 from zhenlineo/1.2-simplify-auth
Removing redundant creation of default auth token in tests
2 parents f109c36 + 035218b commit 7988061

File tree

11 files changed

+43
-58
lines changed

11 files changed

+43
-58
lines changed

‎driver/src/test/java/org/neo4j/driver/v1/integration/BookmarkIT.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import java.util.HashSet;
2727

2828
import org.neo4j.driver.v1.AccessMode;
29-
import org.neo4j.driver.v1.AuthTokens;
3029
import org.neo4j.driver.v1.Driver;
3130
import org.neo4j.driver.v1.GraphDatabase;
3231
import org.neo4j.driver.v1.Session;
@@ -35,7 +34,6 @@
3534
import org.neo4j.driver.v1.exceptions.ClientException;
3635
import org.neo4j.driver.v1.exceptions.TransientException;
3736
import org.neo4j.driver.v1.util.ServerVersion;
38-
import org.neo4j.driver.v1.util.TestNeo4j;
3937
import org.neo4j.driver.v1.util.TestNeo4jSession;
4038

4139
import static java.util.Arrays.asList;
@@ -48,6 +46,7 @@
4846
import static org.junit.Assert.assertThat;
4947
import static org.junit.Assert.fail;
5048
import static org.junit.Assume.assumeTrue;
49+
import static org.neo4j.driver.v1.util.Neo4jRunner.DEFAULT_AUTH_TOKEN;
5150
import static org.neo4j.driver.v1.util.ServerVersion.v3_1_0;
5251

5352
public class BookmarkIT
@@ -75,8 +74,7 @@ public void assumeBookmarkSupport()
7574
public void shouldConnectIPv6Uri()
7675
{
7776
// Given
78-
try(Driver driver = GraphDatabase.driver( "bolt://[::1]:7687",
79-
AuthTokens.basic( TestNeo4j.USER, TestNeo4j.PASSWORD ) );
77+
try(Driver driver = GraphDatabase.driver( "bolt://[::1]:7687", DEFAULT_AUTH_TOKEN );
8078
Session session = driver.session() )
8179
{
8280
// When

‎driver/src/test/java/org/neo4j/driver/v1/integration/DriverCloseIT.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030

3131
import org.neo4j.driver.internal.logging.ConsoleLogging;
3232
import org.neo4j.driver.v1.AccessMode;
33-
import org.neo4j.driver.v1.AuthTokens;
3433
import org.neo4j.driver.v1.Config;
3534
import org.neo4j.driver.v1.Driver;
3635
import org.neo4j.driver.v1.GraphDatabase;
@@ -43,6 +42,7 @@
4342
import static org.junit.Assert.assertEquals;
4443
import static org.junit.Assert.assertThat;
4544
import static org.junit.Assert.fail;
45+
import static org.neo4j.driver.v1.util.Neo4jRunner.DEFAULT_AUTH_TOKEN;
4646

4747
@RunWith( Enclosed.class )
4848
public class DriverCloseIT
@@ -174,8 +174,7 @@ protected Driver createDriver()
174174
.withLogging( new ConsoleLogging( Level.OFF ) )
175175
.toConfig();
176176

177-
return GraphDatabase.driver( "bolt+routing://127.0.0.1:9001",
178-
AuthTokens.basic( TestNeo4j.USER, TestNeo4j.PASSWORD ), config );
177+
return GraphDatabase.driver( "bolt+routing://127.0.0.1:9001", DEFAULT_AUTH_TOKEN, config );
179178
}
180179

181180
@Test

‎driver/src/test/java/org/neo4j/driver/v1/integration/LoadCSVIT.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424
import java.io.IOException;
2525

26-
import org.neo4j.driver.v1.AuthTokens;
2726
import org.neo4j.driver.v1.Driver;
2827
import org.neo4j.driver.v1.GraphDatabase;
2928
import org.neo4j.driver.v1.Session;
@@ -44,8 +43,7 @@ public class LoadCSVIT
4443
@Test
4544
public void shouldLoadCSV() throws Throwable
4645
{
47-
try( Driver driver = GraphDatabase.driver( neo4j.uri(),
48-
AuthTokens.basic( TestNeo4j.USER, TestNeo4j.PASSWORD ) );
46+
try( Driver driver = GraphDatabase.driver( neo4j.uri(), neo4j.authToken() );
4947
Session session = driver.session() )
5048
{
5149
String csvFileUrl = createLocalIrisData( session );

‎driver/src/test/java/org/neo4j/driver/v1/integration/LoggingIT.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,12 @@
2121
import org.junit.Rule;
2222
import org.junit.Test;
2323

24-
import org.neo4j.driver.v1.AuthTokens;
2524
import org.neo4j.driver.v1.Config;
2625
import org.neo4j.driver.v1.Driver;
2726
import org.neo4j.driver.v1.GraphDatabase;
2827
import org.neo4j.driver.v1.Logger;
2928
import org.neo4j.driver.v1.Logging;
3029
import org.neo4j.driver.v1.Session;
31-
import org.neo4j.driver.v1.util.Neo4jRunner;
3230
import org.neo4j.driver.v1.util.TestNeo4j;
3331

3432
import static org.mockito.Matchers.anyString;
@@ -40,7 +38,7 @@
4038
public class LoggingIT
4139
{
4240
@Rule
43-
public TestNeo4j server = new TestNeo4j();
41+
public TestNeo4j neo4j = new TestNeo4j();
4442

4543
@Test
4644
public void logShouldRecordDebugAndTraceInfo() throws Exception
@@ -49,9 +47,7 @@ public void logShouldRecordDebugAndTraceInfo() throws Exception
4947
Logging logging = mock( Logging.class );
5048
Logger logger = mock( Logger.class );
5149

52-
try( Driver driver = GraphDatabase.driver(
53-
Neo4jRunner.DEFAULT_URI,
54-
AuthTokens.basic( TestNeo4j.USER, TestNeo4j.PASSWORD ),
50+
try( Driver driver = GraphDatabase.driver( neo4j.uri(), neo4j.authToken(),
5551
Config.build().withLogging( logging ).toConfig() ) )
5652
{
5753
// When

‎driver/src/test/java/org/neo4j/driver/v1/integration/ServerKilledIT.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,18 @@
3535
import org.neo4j.driver.internal.util.Clock;
3636
import org.neo4j.driver.internal.util.DriverFactoryWithClock;
3737
import org.neo4j.driver.internal.util.FakeClock;
38-
import org.neo4j.driver.v1.AuthToken;
39-
import org.neo4j.driver.v1.AuthTokens;
4038
import org.neo4j.driver.v1.Config;
4139
import org.neo4j.driver.v1.Driver;
4240
import org.neo4j.driver.v1.GraphDatabase;
4341
import org.neo4j.driver.v1.Record;
4442
import org.neo4j.driver.v1.Session;
4543
import org.neo4j.driver.v1.exceptions.ServiceUnavailableException;
46-
import org.neo4j.driver.v1.util.Neo4jRunner;
4744
import org.neo4j.driver.v1.util.TestNeo4j;
4845

4946
import static org.junit.Assert.assertEquals;
5047
import static org.junit.Assert.fail;
48+
import static org.neo4j.driver.v1.util.Neo4jRunner.DEFAULT_AUTH_TOKEN;
49+
import static org.neo4j.driver.v1.util.Neo4jRunner.DEFAULT_URI;
5150

5251
/**
5352
* Mainly concerned about the connection pool - we want to make sure that bad connections are evacuated from the
@@ -81,8 +80,7 @@ public void shouldRecoverFromServerRestart() throws Throwable
8180
// config with sessionLivenessCheckTimeout not set, i.e. turned off
8281
Config config = Config.build().withEncryptionLevel( encryptionLevel ).toConfig();
8382

84-
try ( Driver driver = GraphDatabase.driver( Neo4jRunner.DEFAULT_URI,
85-
AuthTokens.basic( TestNeo4j.USER, TestNeo4j.PASSWORD ), config ) )
83+
try ( Driver driver = GraphDatabase.driver( DEFAULT_URI, DEFAULT_AUTH_TOKEN, config ) )
8684
{
8785
acquireAndReleaseConnections( 4, driver );
8886

@@ -159,9 +157,8 @@ private static void acquireAndReleaseConnections( int count, Driver driver )
159157
private static Driver createDriver( Clock clock, Config config )
160158
{
161159
DriverFactory factory = new DriverFactoryWithClock( clock );
162-
AuthToken auth = AuthTokens.basic( TestNeo4j.USER, TestNeo4j.PASSWORD );
163160
RoutingSettings routingSettings = new RoutingSettings( 1, 1 );
164161
RetrySettings retrySettings = RetrySettings.DEFAULT;
165-
return factory.newInstance( Neo4jRunner.DEFAULT_URI, auth, routingSettings, retrySettings, config );
162+
return factory.newInstance( DEFAULT_URI, DEFAULT_AUTH_TOKEN, routingSettings, retrySettings, config );
166163
}
167164
}

‎driver/src/test/java/org/neo4j/driver/v1/integration/SessionIT.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1341,14 +1341,12 @@ private Driver newDriverWithFixedRetries( int maxRetriesCount )
13411341
{
13421342
DriverFactory driverFactory = new DriverFactoryWithFixedRetryLogic( maxRetriesCount );
13431343
RoutingSettings routingConf = new RoutingSettings( 1, 1 );
1344-
AuthToken auth = AuthTokens.basic( TestNeo4j.USER, TestNeo4j.PASSWORD );
1345-
return driverFactory.newInstance( neo4j.uri(), auth, routingConf, RetrySettings.DEFAULT, noLoggingConfig() );
1344+
return driverFactory.newInstance( neo4j.uri(), neo4j.authToken(), routingConf, RetrySettings.DEFAULT, noLoggingConfig() );
13461345
}
13471346

13481347
private Driver newDriver()
13491348
{
1350-
return GraphDatabase
1351-
.driver( neo4j.uri(), AuthTokens.basic( TestNeo4j.USER, TestNeo4j.PASSWORD ), noLoggingConfig() );
1349+
return GraphDatabase.driver( neo4j.uri(), neo4j.authToken(), noLoggingConfig() );
13521350
}
13531351

13541352
private Driver newDriverWithLimitedRetries( int maxTxRetryTime, TimeUnit unit )
@@ -1357,7 +1355,7 @@ private Driver newDriverWithLimitedRetries( int maxTxRetryTime, TimeUnit unit )
13571355
.withLogging( DevNullLogging.DEV_NULL_LOGGING )
13581356
.withMaxTransactionRetryTime( maxTxRetryTime, unit )
13591357
.toConfig();
1360-
return GraphDatabase.driver( neo4j.uri(), AuthTokens.basic( TestNeo4j.USER, TestNeo4j.PASSWORD ), config );
1358+
return GraphDatabase.driver( neo4j.uri(), neo4j.authToken(), config );
13611359
}
13621360

13631361
private static Config noLoggingConfig()

‎driver/src/test/java/org/neo4j/driver/v1/integration/TLSSocketChannelIT.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import org.neo4j.driver.internal.security.SecurityPlan;
3636
import org.neo4j.driver.internal.security.TLSSocketChannel;
3737
import org.neo4j.driver.internal.util.CertificateTool;
38-
import org.neo4j.driver.v1.AuthTokens;
3938
import org.neo4j.driver.v1.Config;
4039
import org.neo4j.driver.v1.Driver;
4140
import org.neo4j.driver.v1.GraphDatabase;
@@ -45,7 +44,6 @@
4544
import org.neo4j.driver.v1.StatementResult;
4645
import org.neo4j.driver.v1.exceptions.SecurityException;
4746
import org.neo4j.driver.v1.util.CertificateToolTest;
48-
import org.neo4j.driver.v1.util.Neo4jRunner;
4947
import org.neo4j.driver.v1.util.Neo4jSettings;
5048
import org.neo4j.driver.v1.util.TestNeo4j;
5149

@@ -301,8 +299,7 @@ public void shouldEstablishTLSConnection() throws Throwable
301299

302300
Config config = Config.build().withEncryptionLevel( Config.EncryptionLevel.REQUIRED ).toConfig();
303301

304-
try ( Driver driver = GraphDatabase
305-
.driver( Neo4jRunner.DEFAULT_URI, AuthTokens.basic( TestNeo4j.USER, TestNeo4j.PASSWORD ), config );
302+
try ( Driver driver = GraphDatabase.driver( neo4j.uri(), neo4j.authToken(), config );
306303
Session session = driver.session() )
307304
{
308305
StatementResult result = session.run( "RETURN 1" );
@@ -330,8 +327,7 @@ public void shouldWarnIfUsingDeprecatedTLSOption() throws Throwable
330327
.toConfig();
331328

332329
// When
333-
try ( Driver driver = GraphDatabase
334-
.driver( Neo4jRunner.DEFAULT_URI, AuthTokens.basic( TestNeo4j.USER, TestNeo4j.PASSWORD ), config );
330+
try ( Driver driver = GraphDatabase.driver( neo4j.uri(), neo4j.authToken(), config );
335331
Session session = driver.session() )
336332
{
337333
session.run( "RETURN 1" ).consume();

‎driver/src/test/java/org/neo4j/driver/v1/util/Neo4jRunner.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,20 @@ public class Neo4jRunner
5454
private static final String DEFAULT_NEOCTRL_ARGS = "-e 3.1.2";
5555
public static final String NEOCTRL_ARGS = System.getProperty( "neoctrl.args", DEFAULT_NEOCTRL_ARGS );
5656
public static final URI DEFAULT_URI = URI.create( "bolt://localhost:7687" );
57-
public static final AuthToken DEFAULT_AUTH_TOKEN = basic(TestNeo4j.USER, TestNeo4j.PASSWORD);
5857
public static final BoltServerAddress DEFAULT_ADDRESS = BoltServerAddress.from( DEFAULT_URI );
59-
private Driver driver;
58+
59+
public static final String USER = "neo4j";
60+
public static final String PASSWORD = "password";
61+
public static final AuthToken DEFAULT_AUTH_TOKEN = basic( USER, PASSWORD );
62+
6063
private Neo4jSettings currentSettings = Neo4jSettings.TEST_SETTINGS;
6164

6265
public static final String TARGET_DIR = new File( "../target" ).getAbsolutePath();
6366
private static final String NEO4J_DIR = new File( TARGET_DIR, "test-server" ).getAbsolutePath();
6467
public static final String HOME_DIR = new File( NEO4J_DIR, "neo4jHome" ).getAbsolutePath();
6568

69+
private Driver driver;
70+
6671
/** Global runner controlling a single server, used to avoid having to restart the server between tests */
6772
public static synchronized Neo4jRunner getOrCreateGlobalRunner() throws IOException
6873
{
@@ -143,7 +148,7 @@ private void installNeo4j() throws IOException
143148
public void startNeo4j() throws IOException
144149
{
145150
debug( "Starting server..." );
146-
executeCommand( "neoctrl-create-user", HOME_DIR, TestNeo4j.USER, TestNeo4j.PASSWORD );
151+
executeCommand( "neoctrl-create-user", HOME_DIR, USER, PASSWORD );
147152
executeCommand( "neoctrl-start", HOME_DIR );
148153
debug( "Server started." );
149154
}

‎driver/src/test/java/org/neo4j/driver/v1/util/TestNeo4j.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030

3131
import org.neo4j.driver.internal.net.BoltServerAddress;
3232
import org.neo4j.driver.v1.AuthToken;
33-
import org.neo4j.driver.v1.AuthTokens;
3433
import org.neo4j.driver.v1.Driver;
3534
import org.neo4j.driver.v1.Session;
3635

3736
import static org.neo4j.driver.v1.util.Neo4jRunner.DEFAULT_ADDRESS;
37+
import static org.neo4j.driver.v1.util.Neo4jRunner.DEFAULT_AUTH_TOKEN;
3838
import static org.neo4j.driver.v1.util.Neo4jRunner.DEFAULT_URI;
3939
import static org.neo4j.driver.v1.util.Neo4jRunner.HOME_DIR;
4040
import static org.neo4j.driver.v1.util.Neo4jRunner.debug;
@@ -44,8 +44,6 @@
4444

4545
public class TestNeo4j implements TestRule
4646
{
47-
public static final String USER = "neo4j";
48-
public static final String PASSWORD = "password";
4947
public static final String TEST_RESOURCE_FOLDER_PATH = "src/test/resources";
5048
private final Neo4jSettings settings;
5149
private Neo4jRunner runner;
@@ -117,7 +115,7 @@ public URI uri()
117115

118116
public AuthToken authToken()
119117
{
120-
return AuthTokens.basic( USER, PASSWORD );
118+
return DEFAULT_AUTH_TOKEN;
121119
}
122120

123121
public BoltServerAddress address()

‎examples/src/main/java/org/neo4j/docs/driver/BaseApplication.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*/
1919
package org.neo4j.docs.driver;
2020

21-
2221
import org.neo4j.driver.v1.AuthTokens;
2322
import org.neo4j.driver.v1.Driver;
2423
import org.neo4j.driver.v1.GraphDatabase;

0 commit comments

Comments
 (0)