Skip to content

Removing redundant creation of default auth token in tests #350

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 5, 2017
Merged

Removing redundant creation of default auth token in tests #350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions driver/src/test/java/org/neo4j/driver/v1/integration/BookmarkIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import java.util.HashSet;

import org.neo4j.driver.v1.AccessMode;
import org.neo4j.driver.v1.AuthTokens;
import org.neo4j.driver.v1.Driver;
import org.neo4j.driver.v1.GraphDatabase;
import org.neo4j.driver.v1.Session;
Expand All @@ -35,7 +34,6 @@
import org.neo4j.driver.v1.exceptions.ClientException;
import org.neo4j.driver.v1.exceptions.TransientException;
import org.neo4j.driver.v1.util.ServerVersion;
import org.neo4j.driver.v1.util.TestNeo4j;
import org.neo4j.driver.v1.util.TestNeo4jSession;

import static java.util.Arrays.asList;
Expand All @@ -48,6 +46,7 @@
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
import static org.junit.Assume.assumeTrue;
import static org.neo4j.driver.v1.util.Neo4jRunner.DEFAULT_AUTH_TOKEN;
import static org.neo4j.driver.v1.util.ServerVersion.v3_1_0;

public class BookmarkIT
Expand Down Expand Up @@ -75,8 +74,7 @@ public void assumeBookmarkSupport()
public void shouldConnectIPv6Uri()
{
// Given
try(Driver driver = GraphDatabase.driver( "bolt://[::1]:7687",
AuthTokens.basic( TestNeo4j.USER, TestNeo4j.PASSWORD ) );
try(Driver driver = GraphDatabase.driver( "bolt://[::1]:7687", DEFAULT_AUTH_TOKEN );
Session session = driver.session() )
{
// When
Expand Down
5 changes: 2 additions & 3 deletions driver/src/test/java/org/neo4j/driver/v1/integration/DriverCloseIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@

import org.neo4j.driver.internal.logging.ConsoleLogging;
import org.neo4j.driver.v1.AccessMode;
import org.neo4j.driver.v1.AuthTokens;
import org.neo4j.driver.v1.Config;
import org.neo4j.driver.v1.Driver;
import org.neo4j.driver.v1.GraphDatabase;
Expand All @@ -43,6 +42,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
import static org.neo4j.driver.v1.util.Neo4jRunner.DEFAULT_AUTH_TOKEN;

@RunWith( Enclosed.class )
public class DriverCloseIT
Expand Down Expand Up @@ -174,8 +174,7 @@ protected Driver createDriver()
.withLogging( new ConsoleLogging( Level.OFF ) )
.toConfig();

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

@Test
Expand Down
4 changes: 1 addition & 3 deletions driver/src/test/java/org/neo4j/driver/v1/integration/LoadCSVIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@

import java.io.IOException;

import org.neo4j.driver.v1.AuthTokens;
import org.neo4j.driver.v1.Driver;
import org.neo4j.driver.v1.GraphDatabase;
import org.neo4j.driver.v1.Session;
Expand All @@ -44,8 +43,7 @@ public class LoadCSVIT
@Test
public void shouldLoadCSV() throws Throwable
{
try( Driver driver = GraphDatabase.driver( neo4j.uri(),
AuthTokens.basic( TestNeo4j.USER, TestNeo4j.PASSWORD ) );
try( Driver driver = GraphDatabase.driver( neo4j.uri(), neo4j.authToken() );
Session session = driver.session() )
{
String csvFileUrl = createLocalIrisData( session );
Expand Down
8 changes: 2 additions & 6 deletions driver/src/test/java/org/neo4j/driver/v1/integration/LoggingIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,12 @@
import org.junit.Rule;
import org.junit.Test;

import org.neo4j.driver.v1.AuthTokens;
import org.neo4j.driver.v1.Config;
import org.neo4j.driver.v1.Driver;
import org.neo4j.driver.v1.GraphDatabase;
import org.neo4j.driver.v1.Logger;
import org.neo4j.driver.v1.Logging;
import org.neo4j.driver.v1.Session;
import org.neo4j.driver.v1.util.Neo4jRunner;
import org.neo4j.driver.v1.util.TestNeo4j;

import static org.mockito.Matchers.anyString;
Expand All @@ -40,7 +38,7 @@
public class LoggingIT
{
@Rule
public TestNeo4j server = new TestNeo4j();
public TestNeo4j neo4j = new TestNeo4j();

@Test
public void logShouldRecordDebugAndTraceInfo() throws Exception
Expand All @@ -49,9 +47,7 @@ public void logShouldRecordDebugAndTraceInfo() throws Exception
Logging logging = mock( Logging.class );
Logger logger = mock( Logger.class );

try( Driver driver = GraphDatabase.driver(
Neo4jRunner.DEFAULT_URI,
AuthTokens.basic( TestNeo4j.USER, TestNeo4j.PASSWORD ),
try( Driver driver = GraphDatabase.driver( neo4j.uri(), neo4j.authToken(),
Config.build().withLogging( logging ).toConfig() ) )
{
// When
Expand Down
11 changes: 4 additions & 7 deletions driver/src/test/java/org/neo4j/driver/v1/integration/ServerKilledIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,18 @@
import org.neo4j.driver.internal.util.Clock;
import org.neo4j.driver.internal.util.DriverFactoryWithClock;
import org.neo4j.driver.internal.util.FakeClock;
import org.neo4j.driver.v1.AuthToken;
import org.neo4j.driver.v1.AuthTokens;
import org.neo4j.driver.v1.Config;
import org.neo4j.driver.v1.Driver;
import org.neo4j.driver.v1.GraphDatabase;
import org.neo4j.driver.v1.Record;
import org.neo4j.driver.v1.Session;
import org.neo4j.driver.v1.exceptions.ServiceUnavailableException;
import org.neo4j.driver.v1.util.Neo4jRunner;
import org.neo4j.driver.v1.util.TestNeo4j;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
import static org.neo4j.driver.v1.util.Neo4jRunner.DEFAULT_AUTH_TOKEN;
import static org.neo4j.driver.v1.util.Neo4jRunner.DEFAULT_URI;

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

try ( Driver driver = GraphDatabase.driver( Neo4jRunner.DEFAULT_URI,
AuthTokens.basic( TestNeo4j.USER, TestNeo4j.PASSWORD ), config ) )
try ( Driver driver = GraphDatabase.driver( DEFAULT_URI, DEFAULT_AUTH_TOKEN, config ) )
{
acquireAndReleaseConnections( 4, driver );

Expand Down Expand Up @@ -159,9 +157,8 @@ private static void acquireAndReleaseConnections( int count, Driver driver )
private static Driver createDriver( Clock clock, Config config )
{
DriverFactory factory = new DriverFactoryWithClock( clock );
AuthToken auth = AuthTokens.basic( TestNeo4j.USER, TestNeo4j.PASSWORD );
RoutingSettings routingSettings = new RoutingSettings( 1, 1 );
RetrySettings retrySettings = RetrySettings.DEFAULT;
return factory.newInstance( Neo4jRunner.DEFAULT_URI, auth, routingSettings, retrySettings, config );
return factory.newInstance( DEFAULT_URI, DEFAULT_AUTH_TOKEN, routingSettings, retrySettings, config );
}
}
8 changes: 3 additions & 5 deletions driver/src/test/java/org/neo4j/driver/v1/integration/SessionIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1341,14 +1341,12 @@ private Driver newDriverWithFixedRetries( int maxRetriesCount )
{
DriverFactory driverFactory = new DriverFactoryWithFixedRetryLogic( maxRetriesCount );
RoutingSettings routingConf = new RoutingSettings( 1, 1 );
AuthToken auth = AuthTokens.basic( TestNeo4j.USER, TestNeo4j.PASSWORD );
return driverFactory.newInstance( neo4j.uri(), auth, routingConf, RetrySettings.DEFAULT, noLoggingConfig() );
return driverFactory.newInstance( neo4j.uri(), neo4j.authToken(), routingConf, RetrySettings.DEFAULT, noLoggingConfig() );
}

private Driver newDriver()
{
return GraphDatabase
.driver( neo4j.uri(), AuthTokens.basic( TestNeo4j.USER, TestNeo4j.PASSWORD ), noLoggingConfig() );
return GraphDatabase.driver( neo4j.uri(), neo4j.authToken(), noLoggingConfig() );
}

private Driver newDriverWithLimitedRetries( int maxTxRetryTime, TimeUnit unit )
Expand All @@ -1357,7 +1355,7 @@ private Driver newDriverWithLimitedRetries( int maxTxRetryTime, TimeUnit unit )
.withLogging( DevNullLogging.DEV_NULL_LOGGING )
.withMaxTransactionRetryTime( maxTxRetryTime, unit )
.toConfig();
return GraphDatabase.driver( neo4j.uri(), AuthTokens.basic( TestNeo4j.USER, TestNeo4j.PASSWORD ), config );
return GraphDatabase.driver( neo4j.uri(), neo4j.authToken(), config );
}

private static Config noLoggingConfig()
Expand Down
8 changes: 2 additions & 6 deletions driver/src/test/java/org/neo4j/driver/v1/integration/TLSSocketChannelIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
import org.neo4j.driver.internal.security.SecurityPlan;
import org.neo4j.driver.internal.security.TLSSocketChannel;
import org.neo4j.driver.internal.util.CertificateTool;
import org.neo4j.driver.v1.AuthTokens;
import org.neo4j.driver.v1.Config;
import org.neo4j.driver.v1.Driver;
import org.neo4j.driver.v1.GraphDatabase;
Expand All @@ -45,7 +44,6 @@
import org.neo4j.driver.v1.StatementResult;
import org.neo4j.driver.v1.exceptions.SecurityException;
import org.neo4j.driver.v1.util.CertificateToolTest;
import org.neo4j.driver.v1.util.Neo4jRunner;
import org.neo4j.driver.v1.util.Neo4jSettings;
import org.neo4j.driver.v1.util.TestNeo4j;

Expand Down Expand Up @@ -301,8 +299,7 @@ public void shouldEstablishTLSConnection() throws Throwable

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

try ( Driver driver = GraphDatabase
.driver( Neo4jRunner.DEFAULT_URI, AuthTokens.basic( TestNeo4j.USER, TestNeo4j.PASSWORD ), config );
try ( Driver driver = GraphDatabase.driver( neo4j.uri(), neo4j.authToken(), config );
Session session = driver.session() )
{
StatementResult result = session.run( "RETURN 1" );
Expand Down Expand Up @@ -330,8 +327,7 @@ public void shouldWarnIfUsingDeprecatedTLSOption() throws Throwable
.toConfig();

// When
try ( Driver driver = GraphDatabase
.driver( Neo4jRunner.DEFAULT_URI, AuthTokens.basic( TestNeo4j.USER, TestNeo4j.PASSWORD ), config );
try ( Driver driver = GraphDatabase.driver( neo4j.uri(), neo4j.authToken(), config );
Session session = driver.session() )
{
session.run( "RETURN 1" ).consume();
Expand Down
11 changes: 8 additions & 3 deletions driver/src/test/java/org/neo4j/driver/v1/util/Neo4jRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,20 @@ public class Neo4jRunner
private static final String DEFAULT_NEOCTRL_ARGS = "-e 3.1.2";
public static final String NEOCTRL_ARGS = System.getProperty( "neoctrl.args", DEFAULT_NEOCTRL_ARGS );
public static final URI DEFAULT_URI = URI.create( "bolt://localhost:7687" );
public static final AuthToken DEFAULT_AUTH_TOKEN = basic(TestNeo4j.USER, TestNeo4j.PASSWORD);
public static final BoltServerAddress DEFAULT_ADDRESS = BoltServerAddress.from( DEFAULT_URI );
private Driver driver;

public static final String USER = "neo4j";
public static final String PASSWORD = "password";
public static final AuthToken DEFAULT_AUTH_TOKEN = basic( USER, PASSWORD );

private Neo4jSettings currentSettings = Neo4jSettings.TEST_SETTINGS;

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

private Driver driver;

/** Global runner controlling a single server, used to avoid having to restart the server between tests */
public static synchronized Neo4jRunner getOrCreateGlobalRunner() throws IOException
{
Expand Down Expand Up @@ -143,7 +148,7 @@ private void installNeo4j() throws IOException
public void startNeo4j() throws IOException
{
debug( "Starting server..." );
executeCommand( "neoctrl-create-user", HOME_DIR, TestNeo4j.USER, TestNeo4j.PASSWORD );
executeCommand( "neoctrl-create-user", HOME_DIR, USER, PASSWORD );
executeCommand( "neoctrl-start", HOME_DIR );
debug( "Server started." );
}
Expand Down
6 changes: 2 additions & 4 deletions driver/src/test/java/org/neo4j/driver/v1/util/TestNeo4j.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@

import org.neo4j.driver.internal.net.BoltServerAddress;
import org.neo4j.driver.v1.AuthToken;
import org.neo4j.driver.v1.AuthTokens;
import org.neo4j.driver.v1.Driver;
import org.neo4j.driver.v1.Session;

import static org.neo4j.driver.v1.util.Neo4jRunner.DEFAULT_ADDRESS;
import static org.neo4j.driver.v1.util.Neo4jRunner.DEFAULT_AUTH_TOKEN;
import static org.neo4j.driver.v1.util.Neo4jRunner.DEFAULT_URI;
import static org.neo4j.driver.v1.util.Neo4jRunner.HOME_DIR;
import static org.neo4j.driver.v1.util.Neo4jRunner.debug;
Expand All @@ -44,8 +44,6 @@

public class TestNeo4j implements TestRule
{
public static final String USER = "neo4j";
public static final String PASSWORD = "password";
public static final String TEST_RESOURCE_FOLDER_PATH = "src/test/resources";
private final Neo4jSettings settings;
private Neo4jRunner runner;
Expand Down Expand Up @@ -117,7 +115,7 @@ public URI uri()

public AuthToken authToken()
{
return AuthTokens.basic( USER, PASSWORD );
return DEFAULT_AUTH_TOKEN;
}

public BoltServerAddress address()
Expand Down
1 change: 0 additions & 1 deletion examples/src/main/java/org/neo4j/docs/driver/BaseApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*/
package org.neo4j.docs.driver;


import org.neo4j.driver.v1.AuthTokens;
import org.neo4j.driver.v1.Driver;
import org.neo4j.driver.v1.GraphDatabase;
Expand Down
Loading