Merge branch '1.0' into 1.1

Author: Zhen

driver/src/main/java/org/neo4j/driver/internal/connector/socket/SocketConnection.java

@@ -67,6 +67,7 @@ public SocketConnection( String host, int port, Config config )
     public void init( String clientName, Map<String,Value> authToken )
     {
         queueMessage( new InitMessage( clientName, authToken ), StreamCollector.NO_OP );
+        sync();
     }
 
     @Override

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

@@ -74,15 +74,12 @@ public void shouldGetHelpfulErrorOnInvalidCredentials() throws Throwable
         String password = "secret";
         enableAuth( password );
 
-        Driver driver = GraphDatabase.driver( neo4j.address(), basic("thisisnotthepassword", password ) );
-        Session session = driver.session();
-
         // Expect
         exception.expect( ClientException.class );
         exception.expectMessage( "The client is unauthorized due to authentication failure." );
 
         // When
-        session.run( "RETURN 1" ).single().get(0);
+        GraphDatabase.driver( neo4j.address(), basic("thisisnotthepassword", password ) ).session();
     }
 
     private void enableAuth( String password ) throws Exception

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

@@ -48,9 +48,7 @@ public void shouldThrowHelpfulSyntaxError() throws Throwable
     {
         // Expect
         exception.expect( ClientException.class );
-        exception.expectMessage( "Invalid input 'i': expected <init> (line 1, column 1 (offset: 0))\n" +
-                                 "\"invalid statement\"\n" +
-                                 " ^" );
+        exception.expectMessage( "Invalid input 'i'" );
 
         // When
         StatementResult result = session.run( "invalid statement" );

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

@@ -32,7 +32,8 @@
  * The base class to run all cucumber tests
  */
 @RunWith( DriverCucumberAdapter.class )
-@CucumberOptions( features = {"target/resources/features"}, strict=true, tags={"~@db", "~@fixed_session_pool"}, format = {"pretty"})
+@CucumberOptions( features = {"target/resources/features"}, strict=true, tags={"~@db", "~@fixed_session_pool"},
+        format = {"default_summary"})
 public class DriverComplianceIT
 {
     @Rule

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

@@ -63,7 +63,7 @@ public void resetValues()
         statementRunner = null;
         stringRunner = null;
         runners = new ArrayList<>();
-        mappedTypes = new HashMap<>(  );
+        mappedTypes = new HashMap<>();
         driver = neo4j.driver();
     }
 
@@ -79,6 +79,7 @@ public void closeRunners()
     @Before("@reset_database")
     public void emptyDatabase()
     {
+        Driver driver = neo4j.driver();
         try ( Session session = driver.session())
         {
             session.run( "MATCH (n) DETACH DELETE n" );