Merge branch '1.0' into 1.0-tck-tests

Author: RagnarW

driver/src/main/java/org/neo4j/driver/internal/InternalSession.java

@@ -89,7 +89,7 @@ public StatementResult run( String statementText, Value statementParameters )
     @Override
     public StatementResult run( Statement statement )
     {
-        ensureConnectionIsValid();
+        ensureConnectionIsValidBeforeRunningSession();
         InternalStatementResult cursor = new InternalStatementResult( connection, statement );
         connection.run( statement.text(), statement.parameters().asMap( Values.ofValue() ), cursor.runResponseCollector() );
         connection.pullAll( cursor.pullAllResponseCollector() );
@@ -132,7 +132,7 @@ public void close()
     @Override
     public Transaction beginTransaction()
     {
-        ensureConnectionIsValid();
+        ensureConnectionIsValidBeforeOpeningTransaction();
         currentTransaction = new InternalTransaction( connection, txCleanup );
         connection.onError( new Runnable() {
             @Override
@@ -156,9 +156,15 @@ public TypeSystem typeSystem()
         return InternalTypeSystem.TYPE_SYSTEM;
     }
 
-    private void ensureConnectionIsValid()
+    private void ensureConnectionIsValidBeforeRunningSession()
     {
-        ensureNoOpenTransaction();
+        ensureNoOpenTransactionBeforeRunningSession();
+        ensureConnectionIsOpen();
+    }
+
+    private void ensureConnectionIsValidBeforeOpeningTransaction()
+    {
+        ensureNoOpenTransactionBeforeOpeningTransaction();
         ensureConnectionIsOpen();
     }
 
@@ -174,12 +180,21 @@ protected void finalize() throws Throwable
         super.finalize();
     }
 
-    private void ensureNoOpenTransaction()
+    private void ensureNoOpenTransactionBeforeRunningSession()
+    {
+        if ( currentTransaction != null )
+        {
+            throw new ClientException( "Statements cannot be run directly on a session with an open transaction;" +
+                                       " either run from within the transaction or use a different session." );
+        }
+    }
+
+    private void ensureNoOpenTransactionBeforeOpeningTransaction()
     {
         if ( currentTransaction != null )
         {
-            throw new ClientException( "Please close the currently open transaction object before running " +
-                                       "more statements/transactions in the current session." );
+            throw new ClientException( "You cannot begin a transaction on a session with an open transaction;" +
+                                       " either run from within the transaction or use a different session." );
         }
     }
 

driver/src/main/java/org/neo4j/driver/internal/pool/InternalConnectionPool.java

@@ -43,13 +43,13 @@
 /**
  * A basic connection pool that optimizes for threads being long-lived, acquiring/releasing many connections.
  * It uses a global queue as a fallback pool, but tries to avoid coordination by storing connections in a ThreadLocal.
- * <p>
+ *
  * Safety is achieved by tracking thread locals getting garbage collected, returning connections to the global pool
  * when this happens.
- * <p>
+ *
  * If threads are long-lived, this pool will achieve linearly scalable performance with overhead equivalent to a
  * hash-map lookup per acquire.
- * <p>
+ *
  * If threads are short-lived, this pool is not ideal.
  */
 public class InternalConnectionPool implements ConnectionPool
@@ -185,7 +185,7 @@ public PooledConnection allocate( Consumer<PooledConnection> release )
                 if ( connector == null )
                 {
                     throw new ClientException(
-                            format( "Unsupported transport: '%s' in url: '%s'. Supported transports are: '%s'.",
+                            format( "Unsupported URI scheme: '%s' in url: '%s'. Supported transports are: '%s'.",
                                     uri.getScheme(), uri, connectorSchemes() ) );
                 }
                 Connection conn = connector.connect( uri, config, authToken );

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

@@ -18,6 +18,7 @@
  */
 package org.neo4j.driver.v1.integration;
 
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -34,6 +35,7 @@
 import static org.junit.Assert.assertFalse;
 import static org.neo4j.driver.v1.Values.parameters;
 
+@Ignore
 public class LoadCSVIT
 {
     @Rule

driver/src/test/java/org/neo4j/driver/v1/tck/DriverAuthSteps.java

@@ -24,9 +24,10 @@
 import cucumber.api.java.en.And;
 import cucumber.api.java.en.Given;
 import cucumber.api.java.en.Then;
-import cucumber.runtime.CucumberException;
 
 import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
 
 import org.neo4j.driver.internal.auth.InternalAuthToken;
 import org.neo4j.driver.v1.Driver;
@@ -43,12 +44,13 @@
 public class DriverAuthSteps
 {
     Driver driver = null;
-    File tempFile = null;
+    File tempDir = null;
 
     @Before( "@auth" )
-    public void setUp()
+    public void setUp() throws IOException
     {
-        tempFile = new File( "auth" );
+        tempDir = Files.createTempDirectory("dbms").toFile();
+        tempDir.deleteOnExit();
     }
 
     @After( "@auth" )
@@ -57,14 +59,16 @@ public void reset()
 
         try
         {
-            driver.close();
-            neo4j.restartServerOnEmptyDatabase( Neo4jSettings.DEFAULT );
-            tempFile.delete();
+            if (driver != null)
+            {
+                driver.close();
+            }
+            neo4j.useDefaultEncryptionKeyAndCert();
         }
         catch ( Exception e )
         {
             e.printStackTrace();
-            throw new CucumberException( "Failed to reset database" );
+            throw new RuntimeException( "Failed to reset database" );
         }
     }
 
@@ -119,7 +123,7 @@ private Driver configureCredentials( String name, String oldPassword, String new
     {
         neo4j.restartServerOnEmptyDatabase( Neo4jSettings.DEFAULT
                 .updateWith( Neo4jSettings.AUTH_ENABLED, "true" )
-                .updateWith( Neo4jSettings.DATA_DIR, tempFile.getAbsolutePath() ) );
+                .updateWith( Neo4jSettings.DATA_DIR, tempDir.getAbsolutePath().replace("\\", "/") ));
 
         Driver driver = GraphDatabase.driver( neo4j.address(), new InternalAuthToken(
                 parameters(

driver/src/test/java/org/neo4j/driver/v1/tck/DriverComplianceIT.java

@@ -32,12 +32,11 @@
  * The base class to run all cucumber tests
  */
 @RunWith( DriverCucumberAdapter.class )
-@CucumberOptions( features = {"target/resources/features"}, strict = true, tags = {"~@db",
-        "~@in_dev"}, format = {"pretty"} )
+@CucumberOptions( features = {"target/resources/features"}, strict=true, tags={"~@db"}, format = {"pretty"})
 public class DriverComplianceIT
 {
     @Rule
-    TemporaryFolder folder = new TemporaryFolder();
+    TemporaryFolder folder = new TemporaryFolder(  );
 
     @ClassRule
     public static TestNeo4j neo4j = new TestNeo4j();

driver/src/test/java/org/neo4j/driver/v1/tck/DriverResultApiSteps.java

@@ -33,7 +33,6 @@
 
 import org.neo4j.driver.v1.Statement;
 import org.neo4j.driver.v1.Value;
-import org.neo4j.driver.v1.exceptions.ClientException;
 import org.neo4j.driver.v1.summary.InputPosition;
 import org.neo4j.driver.v1.summary.Notification;
 import org.neo4j.driver.v1.summary.Plan;
@@ -75,15 +74,7 @@ public void theResultCursorIsFullyConsumed() throws Throwable
     {
         for ( CypherStatementRunner runner : runners )
         {
-            try
-            {
-                runner.result().peek();
-            }
-            catch ( ClientException e )
-            {
-                return;
-            }
-            assertThat( runner.result().hasNext(), equalTo( false ) );
+            assertThat( runner.result().list().isEmpty(), equalTo( true ) );
         }
     }
 

driver/src/test/java/org/neo4j/driver/v1/tck/DriverSecurityComplianceSteps.java

@@ -246,7 +246,7 @@ public void iShouldGetAHelpfulErrorExplainingThatCertificatedNotSigned() throws
         assertThat( exception, notNullValue() );
         assertThat( exception, instanceOf( ClientException.class ) );
         Throwable rootCause = getRootCause( exception );
-        assertThat( rootCause.toString(), containsString( "No trusted certificate found") );
+        assertThat( rootCause.toString(), containsString( "Signature does not match.") );
     }
 
     @After("@tls")