Skip to content

Guard couple tests with assumption about bookmark support #329

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
Mar 9, 2017
Merged

Guard couple tests with assumption about bookmark support #329

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: 3 additions & 3 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 @@ -31,6 +31,7 @@
import org.neo4j.driver.v1.Transaction;
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.TestNeo4jSession;

import static java.util.Arrays.asList;
Expand All @@ -43,7 +44,6 @@
import static org.junit.Assert.fail;
import static org.junit.Assume.assumeTrue;
import static org.neo4j.driver.v1.util.ServerVersion.v3_1_0;
import static org.neo4j.driver.v1.util.ServerVersion.version;

public class BookmarkIT
{
Expand All @@ -61,8 +61,8 @@ public void assumeBookmarkSupport()
driver = sessionRule.driver();
session = sessionRule;

String version = session.run( "RETURN 1" ).consume().server().version();
assumeTrue( version( version ).greaterThanOrEqual( v3_1_0 ) );
ServerVersion serverVersion = ServerVersion.version( driver );
assumeTrue( serverVersion.greaterThanOrEqual( v3_1_0 ) );
}

@Test
Expand Down
14 changes: 14 additions & 0 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 @@ -44,6 +44,7 @@
import org.neo4j.driver.v1.exceptions.ClientException;
import org.neo4j.driver.v1.exceptions.Neo4jException;
import org.neo4j.driver.v1.exceptions.ServiceUnavailableException;
import org.neo4j.driver.v1.util.ServerVersion;
import org.neo4j.driver.v1.util.TestNeo4j;

import static org.hamcrest.CoreMatchers.containsString;
Expand All @@ -60,12 +61,14 @@
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.junit.Assume.assumeTrue;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.neo4j.driver.v1.Config.defaultConfig;
import static org.neo4j.driver.v1.Values.parameters;
import static org.neo4j.driver.v1.util.ServerVersion.v3_1_0;

public class SessionIT
{
Expand Down Expand Up @@ -551,6 +554,7 @@ public void readTxCommittedWithoutTxSuccess()
try ( Driver driver = newDriverWithoutRetries();
Session session = driver.session() )
{
assumeBookmarkSupport( driver );
assertNull( session.lastBookmark() );

long answer = session.readTransaction( new TransactionWork<Long>()
Expand Down Expand Up @@ -600,6 +604,7 @@ public void readTxRolledBackWithTxFailure()
try ( Driver driver = newDriverWithoutRetries();
Session session = driver.session() )
{
assumeBookmarkSupport( driver );
assertNull( session.lastBookmark() );

long answer = session.readTransaction( new TransactionWork<Long>()
Expand Down Expand Up @@ -654,6 +659,7 @@ public void readTxRolledBackWhenExceptionIsThrown()
try ( Driver driver = newDriverWithoutRetries();
Session session = driver.session() )
{
assumeBookmarkSupport( driver );
assertNull( session.lastBookmark() );

try
Expand Down Expand Up @@ -723,6 +729,7 @@ public void readTxRolledBackWhenMarkedBothSuccessAndFailure()
try ( Driver driver = newDriverWithoutRetries();
Session session = driver.session() )
{
assumeBookmarkSupport( driver );
assertNull( session.lastBookmark() );

long answer = session.readTransaction( new TransactionWork<Long>()
Expand Down Expand Up @@ -779,6 +786,7 @@ public void readTxRolledBackWhenMarkedAsSuccessAndThrowsException()
try ( Driver driver = newDriverWithoutRetries();
Session session = driver.session() )
{
assumeBookmarkSupport( driver );
assertNull( session.lastBookmark() );

try
Expand Down Expand Up @@ -957,6 +965,12 @@ private static ThrowingWork newThrowingWorkSpy( String query, int failures )
return spy( new ThrowingWork( query, failures ) );
}

private static void assumeBookmarkSupport( Driver driver )
{
ServerVersion serverVersion = ServerVersion.version( driver );
assumeTrue( serverVersion.greaterThanOrEqual( v3_1_0 ) );
}

private static class ThrowingWork implements TransactionWork<Record>
{
final String query;
Expand Down
12 changes: 12 additions & 0 deletions driver/src/test/java/org/neo4j/driver/v1/util/ServerVersion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import org.neo4j.driver.v1.Driver;
import org.neo4j.driver.v1.Session;

import static java.lang.Integer.compare;

public class ServerVersion
Expand All @@ -41,6 +44,15 @@ private ServerVersion( int major, int minor, int patch )
public static final ServerVersion v3_1_0 = new ServerVersion(3, 1, 0);
public static final ServerVersion v3_0_0 = new ServerVersion(3, 0, 0);

public static ServerVersion version( Driver driver )
{
try ( Session session = driver.session() )
{
String versionString = session.run( "RETURN 1" ).consume().server().version();
return version( versionString );
}
}

public static ServerVersion version( String server )
{
if ( server == null )
Expand Down