Skip to content

1.2 examples #349

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 5 commits into from
Apr 4, 2017
Merged

1.2 examples #349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f64df75
Full set of new examples
technige Mar 23, 2017
1656cb4
Default test runner should use auth
technige Mar 31, 2017
9995a82
Added license header and changed to java 7
Apr 3, 2017
8cc1106
Muted commandline output
Apr 3, 2017
eaf7a34
Reformat the code to use the default format
Apr 3, 2017
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
3 changes: 0 additions & 3 deletions .gitmodules
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions driver/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,16 +93,6 @@

<build>
<plugins>
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<configuration>
<header>../driver/src/main/resources/license-header.txt</header>
<mapping>
<java>SLASHSTAR_STYLE</java>
</mapping>
</configuration>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
Expand Down
7 changes: 5 additions & 2 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,6 +26,7 @@
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 @@ -34,6 +35,7 @@
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 Down Expand Up @@ -73,8 +75,9 @@ public void assumeBookmarkSupport()
public void shouldConnectIPv6Uri()
{
// Given
try( Driver driver = GraphDatabase.driver( "bolt://[::1]:7687" );
Session session = driver.session() )
try(Driver driver = GraphDatabase.driver( "bolt://[::1]:7687",
AuthTokens.basic( TestNeo4j.USER, TestNeo4j.PASSWORD ) );
Session session = driver.session() )
{
// When
StatementResult result = session.run( "RETURN 1" );
Expand Down
2 changes: 1 addition & 1 deletion driver/src/test/java/org/neo4j/driver/v1/integration/ConnectionHandlingIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public class ConnectionHandlingIT
public void createDriver()
{
DriverFactoryWithConnector driverFactory = new DriverFactoryWithConnector();
AuthToken auth = AuthTokens.none();
AuthToken auth = neo4j.authToken();
RoutingSettings routingSettings = new RoutingSettings( 1, 1 );
RetrySettings retrySettings = RetrySettings.DEFAULT;
driver = driverFactory.newInstance( neo4j.uri(), auth, routingSettings, retrySettings, defaultConfig() );
Expand Down
6 changes: 4 additions & 2 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,6 +30,7 @@

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 Down Expand Up @@ -123,7 +124,7 @@ public static class DirectDriverCloseIT extends DriverCloseITBase
@Override
protected Driver createDriver()
{
return GraphDatabase.driver( neo4j.uri() );
return GraphDatabase.driver( neo4j.uri(), neo4j.authToken() );
}

@Test
Expand Down Expand Up @@ -173,7 +174,8 @@ protected Driver createDriver()
.withLogging( new ConsoleLogging( Level.OFF ) )
.toConfig();

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

@Test
Expand Down
4 changes: 2 additions & 2 deletions driver/src/test/java/org/neo4j/driver/v1/integration/EncryptionIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public class EncryptionIT
public void shouldOperateWithNoEncryption() throws Exception
{
// Given
Driver driver = GraphDatabase.driver( neo4j.uri(), Config.build().withEncryptionLevel( NONE ).toConfig() );
Driver driver = GraphDatabase.driver( neo4j.uri(), neo4j.authToken(), Config.build().withEncryptionLevel( NONE ).toConfig() );

// Then
assertThat( driver.isEncrypted(), equalTo( false ) );
Expand All @@ -60,7 +60,7 @@ public void shouldOperateWithNoEncryption() throws Exception
public void shouldOperateWithRequiredEncryption() throws Exception
{
// Given
Driver driver = GraphDatabase.driver( neo4j.uri(), Config.build().withEncryptionLevel( REQUIRED ).toConfig() );
Driver driver = GraphDatabase.driver( neo4j.uri(), neo4j.authToken(), Config.build().withEncryptionLevel( REQUIRED ).toConfig() );

// Then
assertThat( driver.isEncrypted(), equalTo( true ) );
Expand Down
8 changes: 5 additions & 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,6 +23,7 @@

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 @@ -38,13 +39,14 @@
public class LoadCSVIT
{
@Rule
public TestNeo4j neo4j = new TestNeo4j( Neo4jSettings.TEST_SETTINGS.without( Neo4jSettings.IMPORT_DIR ));
public TestNeo4j neo4j = new TestNeo4j( Neo4jSettings.TEST_SETTINGS.without( Neo4jSettings.IMPORT_DIR ) );

@Test
public void shouldLoadCSV() throws Throwable
{
try( Driver driver = GraphDatabase.driver( neo4j.uri() );
Session session = driver.session() )
try( Driver driver = GraphDatabase.driver( neo4j.uri(),
AuthTokens.basic( TestNeo4j.USER, TestNeo4j.PASSWORD ) );
Session session = driver.session() )
{
String csvFileUrl = createLocalIrisData( session );

Expand Down
4 changes: 2 additions & 2 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,8 +21,7 @@
import org.junit.Rule;
import org.junit.Test;

import java.net.URI;

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 Down Expand Up @@ -52,6 +51,7 @@ public void logShouldRecordDebugAndTraceInfo() throws Exception

try( Driver driver = GraphDatabase.driver(
Neo4jRunner.DEFAULT_URI,
AuthTokens.basic( TestNeo4j.USER, TestNeo4j.PASSWORD ),
Config.build().withLogging( logging ).toConfig() ) )
{
// When
Expand Down
5 changes: 3 additions & 2 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 @@ -81,7 +81,8 @@ 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, config ) )
try ( Driver driver = GraphDatabase.driver( Neo4jRunner.DEFAULT_URI,
AuthTokens.basic( TestNeo4j.USER, TestNeo4j.PASSWORD ), config ) )
{
acquireAndReleaseConnections( 4, driver );

Expand Down Expand Up @@ -158,7 +159,7 @@ private static void acquireAndReleaseConnections( int count, Driver driver )
private static Driver createDriver( Clock clock, Config config )
{
DriverFactory factory = new DriverFactoryWithClock( clock );
AuthToken auth = AuthTokens.none();
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 );
Expand Down
51 changes: 26 additions & 25 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 @@ -114,7 +114,7 @@ public void shouldKnowSessionIsClosed() throws Throwable
public void shouldHandleNullConfig() throws Throwable
{
// Given
try( Driver driver = GraphDatabase.driver( neo4j.uri(), AuthTokens.none(), null ) )
try ( Driver driver = GraphDatabase.driver( neo4j.uri(), AuthTokens.none(), null ) )
{
Session session = driver.session();

Expand All @@ -132,7 +132,7 @@ public void shouldHandleNullAuthToken() throws Throwable
{
// Given
AuthToken token = null;
try ( Driver driver = GraphDatabase.driver( neo4j.uri(), token) )
try ( Driver driver = GraphDatabase.driver( neo4j.uri(), token ) )
{
Session session = driver.session();

Expand Down Expand Up @@ -194,7 +194,7 @@ public void shouldKillLongStreamingResult() throws Throwable
long startTime = -1, endTime;
int recordCount = 0;

try( final Session session = driver.session() )
try ( final Session session = driver.session() )
{
StatementResult result = session.run( "CALL test.driver.longStreamingResult({seconds})",
parameters( "seconds", executionTimeout ) );
Expand All @@ -203,19 +203,19 @@ public void shouldKillLongStreamingResult() throws Throwable

// When
startTime = System.currentTimeMillis();
while( result.hasNext() )
while ( result.hasNext() )
{
result.next();
recordCount++;
}

fail("Should have got an exception about streaming get killed.");
fail( "Should have got an exception about streaming get killed." );
}
catch( ClientException e )
catch ( ClientException e )
{
endTime = System.currentTimeMillis();
assertThat( e.code(), equalTo("Neo.ClientError.Procedure.ProcedureCallFailed") );
assertThat( recordCount, greaterThan(1) );
assertThat( e.code(), equalTo( "Neo.ClientError.Procedure.ProcedureCallFailed" ) );
assertThat( recordCount, greaterThan( 1 ) );

assertTrue( startTime > 0 );
assertTrue( endTime - startTime > killTimeout * 1000 ); // get reset by session.reset
Expand All @@ -231,11 +231,11 @@ public void shouldNotAllowBeginTxIfResetFailureIsNotConsumed() throws Throwable
neo4j.ensureProcedures( "longRunningStatement.jar" );
Driver driver = newDriver();

try( Session session = driver.session() )
try ( Session session = driver.session() )
{
Transaction tx = session.beginTransaction();

tx.run("CALL test.driver.longRunningStatement({seconds})",
tx.run( "CALL test.driver.longRunningStatement({seconds})",
parameters( "seconds", 10 ) );
Thread.sleep( 1000 );
session.reset();
Expand Down Expand Up @@ -280,11 +280,11 @@ public void shouldBeAbleToBeginTxAfterResetFailureIsConsumed() throws Throwable
neo4j.ensureProcedures( "longRunningStatement.jar" );
Driver driver = newDriver();

try( Session session = driver.session() )
try ( Session session = driver.session() )
{
Transaction tx = session.beginTransaction();

StatementResult procedureResult = tx.run("CALL test.driver.longRunningStatement({seconds})",
StatementResult procedureResult = tx.run( "CALL test.driver.longRunningStatement({seconds})",
parameters( "seconds", 10 ) );
Thread.sleep( 1000 );
session.reset();
Expand Down Expand Up @@ -367,19 +367,19 @@ public void shouldAllowMoreTxAfterSessionReset()
try ( Driver driver = newDriver();
Session session = driver.session() )
{
try( Transaction tx = session.beginTransaction() )
try ( Transaction tx = session.beginTransaction() )
{
tx.run("Return 1");
tx.run( "Return 1" );
tx.success();
}

// When reset the state of this session
session.reset();

// Then can run more Tx
try( Transaction tx = session.beginTransaction() )
try ( Transaction tx = session.beginTransaction() )
{
tx.run("Return 2");
tx.run( "Return 2" );
tx.success();
}
}
Expand All @@ -393,15 +393,15 @@ public void shouldMarkTxAsFailedAndDisallowRunAfterSessionReset()
try ( Driver driver = newDriver();
Session session = driver.session() )
{
try( Transaction tx = session.beginTransaction() )
try ( Transaction tx = session.beginTransaction() )
{
// When reset the state of this session
session.reset();
// Then
// Then
tx.run( "Return 1" );
fail( "Should not allow tx run as tx is already failed." );
}
catch( Exception e )
catch ( Exception e )
{
assertThat( e.getMessage(), startsWith( "Cannot run more statements in this transaction" ) );
}
Expand All @@ -416,16 +416,16 @@ public void shouldAllowMoreTxAfterSessionResetInTx()
try ( Driver driver = newDriver();
Session session = driver.session() )
{
try( Transaction tx = session.beginTransaction() )
try ( Transaction tx = session.beginTransaction() )
{
// When reset the state of this session
session.reset();
}

// Then can run more Tx
try( Transaction tx = session.beginTransaction() )
try ( Transaction tx = session.beginTransaction() )
{
tx.run("Return 2");
tx.run( "Return 2" );
tx.success();
}
}
Expand Down Expand Up @@ -1341,13 +1341,14 @@ private Driver newDriverWithFixedRetries( int maxRetriesCount )
{
DriverFactory driverFactory = new DriverFactoryWithFixedRetryLogic( maxRetriesCount );
RoutingSettings routingConf = new RoutingSettings( 1, 1 );
AuthToken auth = AuthTokens.none();
AuthToken auth = AuthTokens.basic( TestNeo4j.USER, TestNeo4j.PASSWORD );
return driverFactory.newInstance( neo4j.uri(), auth, routingConf, RetrySettings.DEFAULT, noLoggingConfig() );
}

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

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

private static Config noLoggingConfig()
Expand Down
Loading